chore(release) prepare 1.2.0

reactjs · Aug 19, 2015 · d919099 · d919099
1 parent 73e72cb
commit d919099
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,14 +2,24 @@
 
 #### Breaking Changes
 
-#### New Features 
+#### New Features
+
+#### Deprecation
+
+#### Bug Fixes
+
+## 1.2.0 (August 19, 2015)
+
+#### Breaking Changes
+
+#### New Features
 
 - Support `--es6` option in component generator #332
 - Support Sprockets 3 #322
 
-#### Deprecation 
+#### Deprecation
 
-#### Bug Fixes 
+#### Bug Fixes
 
 - Don't bother unmounting components `onBeforeUnload` #318
 - Include `React::Rails::VERSION` in the gem #335

diff --git a/README.md b/README.md
@@ -150,8 +150,6 @@ react_component(component_class_name, props={}, html_options={})
 
 ### Server rendering
 
-(This documentation is for the __`master` branch__, please check the [__`1.0.0` README__](https://github.com/reactjs/react-rails/tree/v1.0.0#server-rendering) for that API!)
-
 To render components on the server, pass `prerender: true` to `react_component`:
 
 ```erb

diff --git a/VERSIONS.md b/VERSIONS.md
@@ -10,6 +10,7 @@ You can control what version of React.js (and JSXTransformer) is used by `react-
 | Gem      | React.js |
 |----------|----------|
 | master   | 0.13.3   |
+| 1.2.0    | 0.13.3   |
 | 1.1.0    | 0.13.3   |
 | 1.0.0    | ~> 0.13  |
 | 0.13.0.0 | 0.13.0   |

diff --git a/lib/react/rails/version.rb b/lib/react/rails/version.rb
@@ -1,6 +1,6 @@
 module React
   module Rails
     # If you change this, make sure to update VERSIONS.md
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end
-Original file line number
+Diff line change
@@ Expand Up @@
     ### Server rendering
-    (This documentation is for the __`master` branch__, please check the [__`1.0.0` README__](https://github.com/reactjs/react-rails/tree/v1.0.0#server-rendering) for that API!)
     To render components on the server, pass `prerender: true` to `react_component`:
     ```erb
@@ Expand Down @@