1.5.0

reactjs · Nov 25, 2015 · 3b21569 · 3b21569 · SylarRuby · Nov 25, 2015
1 parent 39c3d4c
commit 3b21569
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@
 
 #### New Features
 
+#### Deprecation
+
+#### Bug Fixes
+
+## 1.5.0 (November 25, 2015)
+
+#### Breaking Changes
+
+#### New Features
+
 - Update to React 0.14.3 #412
 - `config.react.camelize_props = true` will camelize `react_component` prop keys #409
 
@@ -14,7 +24,7 @@
 - Fix chained `.es6` file names with JSX processor #411
 - Don't insert `// =require`s multiple times #398
 
-## 1.4.2 
+## 1.4.2 (November 5, 2015)
 
 #### Breaking Changes
 
@@ -27,7 +37,7 @@
 
 #### Bug Fixes
 
-- Support custom attributes when rendering from controller #384 
+- Support custom attributes when rendering from controller #384
 
 ## 1.4.1 (October 23, 2015)
 

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ Just getting started with React? Make sure to check out the [Getting Started] (h
 Add `react-rails` to your gemfile:
 
 ```ruby
-gem 'react-rails', '~> 1.4.0'
+gem 'react-rails', '~> 1.5.0'
 ```
 
 Next, run the installation script:

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.14.3   |
+| 1.5.0    | 0.14.3   |
 | 1.4.2    | 0.14.2   |
 | 1.4.1    | 0.14.0   |
 | 1.4.0    | 0.14.0   |

diff --git a/lib/react/rails/version.rb b/lib/react/rails/version.rb
@@ -1,6 +1,7 @@
 module React
   module Rails
     # If you change this, make sure to update VERSIONS.md
-    VERSION = '1.4.2'
+    # And the version hint in README.md, if needed
+    VERSION = '1.5.0'
   end
 end