Skip to content

Commit

Permalink
Merge pull request #235 from rmosolgo/call-it-1.0
Browse files Browse the repository at this point in the history
bump to 1.0
  • Loading branch information
Robert Mosolgo committed Apr 7, 2015
2 parents a8f8d83 + 1f00325 commit ff564e8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 17 deletions.
12 changes: 1 addition & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@

# react-rails

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

`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:

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

```ruby
# Gemfile
# If you missed a warning at the top of this README - this is still in development
# which means the latest is not pushed to rubygems.org or tagged as a version. Live
# on the bleeding edge and depend on master.

gem 'react-rails', github: 'reactjs/react-rails'
gem 'react-rails', '~> 1.0'
```

Next, run the installation script.
Expand Down
1 change: 1 addition & 0 deletions VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ There are three ways to control what version of React.js (and JSXTransformer) is
| Gem | React.js |
|----------|----------|
| master | ~> 0.13 |
| 1.0.0 | ~> 0.13 |
| 0.13.0.0 | 0.13.0 |
| 0.12.2.0 | 0.12.2 |
| 0.12.1.0 | 0.12.1 |
Expand Down
2 changes: 1 addition & 1 deletion lib/react/rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module React
module Rails
# If you change this, make sure to update VERSIONS.md
VERSION = '1.0.0.pre'
VERSION = '1.0.0'
end
end
10 changes: 5 additions & 5 deletions react-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ Gem::Specification.new do |s|
s.author = ['Paul O’Shannessy']
s.email = ['[email protected]']

s.add_development_dependency 'bundler', '>= 1.2.2'
s.add_development_dependency 'appraisal'
s.add_development_dependency 'bundler', '>= 1.2.2'
s.add_development_dependency 'coffee-rails'
s.add_development_dependency 'turbolinks', '>= 2.0.0'
s.add_development_dependency 'es5-shim-rails', '>= 2.0.5'
s.add_development_dependency 'jbuilder'
s.add_development_dependency 'poltergeist', '>= 0.3.3'
s.add_development_dependency 'test-unit', '~> 2.5'
s.add_development_dependency 'turbolinks', '>= 2.0.0'

s.add_development_dependency 'jbuilder'

s.add_dependency 'execjs'
s.add_dependency 'coffee-script-source', '~>1.8'
s.add_dependency 'connection_pool'
s.add_dependency 'execjs'
s.add_dependency 'rails', '>= 3.1'
# If you change this, make sure to update VERSIONS.md:
s.add_dependency 'react-source', '~> 0.13'
s.add_dependency 'connection_pool'

s.files = Dir[
'lib/**/*',
Expand Down

0 comments on commit ff564e8

Please sign in to comment.