Skip to content

Commit ff564e8

Browse files
author
Robert Mosolgo
committed
Merge pull request #235 from rmosolgo/call-it-1.0
bump to 1.0
2 parents a8f8d83 + 1f00325 commit ff564e8

File tree

4 files changed

+8
-17
lines changed

4 files changed

+8
-17
lines changed

README.md

+1-11
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77

88
# react-rails
99

10-
> ## react-rails version disclaimer
11-
12-
> ***This README is for `1.x` branch which is still in development. Please switch to latest `0.x` branch for stable version.***
13-
14-
> ***Additionally: `0.x` branch directly follows React versions, `1.x` will not do so.***
1510

1611
`react-rails` makes it easy to use [React](http://facebook.github.io/react/) and [JSX](http://facebook.github.io/react/docs/jsx-in-depth.html) in your Ruby on Rails (3.1+) application. `react-rails` can:
1712

@@ -26,12 +21,7 @@
2621
Add `react-rails` to your gemfile:
2722

2823
```ruby
29-
# Gemfile
30-
# If you missed a warning at the top of this README - this is still in development
31-
# which means the latest is not pushed to rubygems.org or tagged as a version. Live
32-
# on the bleeding edge and depend on master.
33-
34-
gem 'react-rails', github: 'reactjs/react-rails'
24+
gem 'react-rails', '~> 1.0'
3525
```
3626

3727
Next, run the installation script.

VERSIONS.md

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ There are three ways to control what version of React.js (and JSXTransformer) is
1111
| Gem | React.js |
1212
|----------|----------|
1313
| master | ~> 0.13 |
14+
| 1.0.0 | ~> 0.13 |
1415
| 0.13.0.0 | 0.13.0 |
1516
| 0.12.2.0 | 0.12.2 |
1617
| 0.12.1.0 | 0.12.1 |

lib/react/rails/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module React
22
module Rails
33
# If you change this, make sure to update VERSIONS.md
4-
VERSION = '1.0.0.pre'
4+
VERSION = '1.0.0'
55
end
66
end

react-rails.gemspec

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ Gem::Specification.new do |s|
1414
s.author = ['Paul O’Shannessy']
1515
s.email = ['[email protected]']
1616

17-
s.add_development_dependency 'bundler', '>= 1.2.2'
1817
s.add_development_dependency 'appraisal'
18+
s.add_development_dependency 'bundler', '>= 1.2.2'
1919
s.add_development_dependency 'coffee-rails'
20-
s.add_development_dependency 'turbolinks', '>= 2.0.0'
2120
s.add_development_dependency 'es5-shim-rails', '>= 2.0.5'
21+
s.add_development_dependency 'jbuilder'
2222
s.add_development_dependency 'poltergeist', '>= 0.3.3'
2323
s.add_development_dependency 'test-unit', '~> 2.5'
24+
s.add_development_dependency 'turbolinks', '>= 2.0.0'
2425

25-
s.add_development_dependency 'jbuilder'
2626

27-
s.add_dependency 'execjs'
2827
s.add_dependency 'coffee-script-source', '~>1.8'
28+
s.add_dependency 'connection_pool'
29+
s.add_dependency 'execjs'
2930
s.add_dependency 'rails', '>= 3.1'
3031
# If you change this, make sure to update VERSIONS.md:
3132
s.add_dependency 'react-source', '~> 0.13'
32-
s.add_dependency 'connection_pool'
3333

3434
s.files = Dir[
3535
'lib/**/*',

0 commit comments

Comments
 (0)