Commit 80dd4e858d90681e9e3d7e154748f8a55463dac6
1 parent
c4a5e5a4
Exists in
colab
and in
4 other branches
rails updated
Showing
2 changed files
with
27 additions
and
27 deletions
Show diff stats
Gemfile
| 1 | source 'https://rubygems.org' | 1 | source 'https://rubygems.org' |
| 2 | 2 | ||
| 3 | # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' | 3 | # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' |
| 4 | -gem 'rails', '4.1.2.rc1' | 4 | +gem 'rails', '4.1.2.rc3' |
| 5 | 5 | ||
| 6 | # Use sqlite3 as the database for Active Record | 6 | # Use sqlite3 as the database for Active Record |
| 7 | gem 'sqlite3' | 7 | gem 'sqlite3' |
Gemfile.lock
| @@ -11,27 +11,27 @@ GIT | @@ -11,27 +11,27 @@ GIT | ||
| 11 | GEM | 11 | GEM |
| 12 | remote: https://rubygems.org/ | 12 | remote: https://rubygems.org/ |
| 13 | specs: | 13 | specs: |
| 14 | - actionmailer (4.1.2.rc1) | ||
| 15 | - actionpack (= 4.1.2.rc1) | ||
| 16 | - actionview (= 4.1.2.rc1) | 14 | + actionmailer (4.1.2.rc3) |
| 15 | + actionpack (= 4.1.2.rc3) | ||
| 16 | + actionview (= 4.1.2.rc3) | ||
| 17 | mail (~> 2.5.4) | 17 | mail (~> 2.5.4) |
| 18 | - actionpack (4.1.2.rc1) | ||
| 19 | - actionview (= 4.1.2.rc1) | ||
| 20 | - activesupport (= 4.1.2.rc1) | 18 | + actionpack (4.1.2.rc3) |
| 19 | + actionview (= 4.1.2.rc3) | ||
| 20 | + activesupport (= 4.1.2.rc3) | ||
| 21 | rack (~> 1.5.2) | 21 | rack (~> 1.5.2) |
| 22 | rack-test (~> 0.6.2) | 22 | rack-test (~> 0.6.2) |
| 23 | - actionview (4.1.2.rc1) | ||
| 24 | - activesupport (= 4.1.2.rc1) | 23 | + actionview (4.1.2.rc3) |
| 24 | + activesupport (= 4.1.2.rc3) | ||
| 25 | builder (~> 3.1) | 25 | builder (~> 3.1) |
| 26 | erubis (~> 2.7.0) | 26 | erubis (~> 2.7.0) |
| 27 | - activemodel (4.1.2.rc1) | ||
| 28 | - activesupport (= 4.1.2.rc1) | 27 | + activemodel (4.1.2.rc3) |
| 28 | + activesupport (= 4.1.2.rc3) | ||
| 29 | builder (~> 3.1) | 29 | builder (~> 3.1) |
| 30 | - activerecord (4.1.2.rc1) | ||
| 31 | - activemodel (= 4.1.2.rc1) | ||
| 32 | - activesupport (= 4.1.2.rc1) | 30 | + activerecord (4.1.2.rc3) |
| 31 | + activemodel (= 4.1.2.rc3) | ||
| 32 | + activesupport (= 4.1.2.rc3) | ||
| 33 | arel (~> 5.0.0) | 33 | arel (~> 5.0.0) |
| 34 | - activesupport (4.1.2.rc1) | 34 | + activesupport (4.1.2.rc3) |
| 35 | i18n (~> 0.6, >= 0.6.9) | 35 | i18n (~> 0.6, >= 0.6.9) |
| 36 | json (~> 1.7, >= 1.7.7) | 36 | json (~> 1.7, >= 1.7.7) |
| 37 | minitest (~> 5.1) | 37 | minitest (~> 5.1) |
| @@ -168,19 +168,19 @@ GEM | @@ -168,19 +168,19 @@ GEM | ||
| 168 | rack (1.5.2) | 168 | rack (1.5.2) |
| 169 | rack-test (0.6.2) | 169 | rack-test (0.6.2) |
| 170 | rack (>= 1.0) | 170 | rack (>= 1.0) |
| 171 | - rails (4.1.2.rc1) | ||
| 172 | - actionmailer (= 4.1.2.rc1) | ||
| 173 | - actionpack (= 4.1.2.rc1) | ||
| 174 | - actionview (= 4.1.2.rc1) | ||
| 175 | - activemodel (= 4.1.2.rc1) | ||
| 176 | - activerecord (= 4.1.2.rc1) | ||
| 177 | - activesupport (= 4.1.2.rc1) | 171 | + rails (4.1.2.rc3) |
| 172 | + actionmailer (= 4.1.2.rc3) | ||
| 173 | + actionpack (= 4.1.2.rc3) | ||
| 174 | + actionview (= 4.1.2.rc3) | ||
| 175 | + activemodel (= 4.1.2.rc3) | ||
| 176 | + activerecord (= 4.1.2.rc3) | ||
| 177 | + activesupport (= 4.1.2.rc3) | ||
| 178 | bundler (>= 1.3.0, < 2.0) | 178 | bundler (>= 1.3.0, < 2.0) |
| 179 | - railties (= 4.1.2.rc1) | 179 | + railties (= 4.1.2.rc3) |
| 180 | sprockets-rails (~> 2.0) | 180 | sprockets-rails (~> 2.0) |
| 181 | - railties (4.1.2.rc1) | ||
| 182 | - actionpack (= 4.1.2.rc1) | ||
| 183 | - activesupport (= 4.1.2.rc1) | 181 | + railties (4.1.2.rc3) |
| 182 | + actionpack (= 4.1.2.rc3) | ||
| 183 | + activesupport (= 4.1.2.rc3) | ||
| 184 | rake (>= 0.8.7) | 184 | rake (>= 0.8.7) |
| 185 | thor (>= 0.18.1, < 2.0) | 185 | thor (>= 0.18.1, < 2.0) |
| 186 | rake (10.3.2) | 186 | rake (10.3.2) |
| @@ -287,7 +287,7 @@ DEPENDENCIES | @@ -287,7 +287,7 @@ DEPENDENCIES | ||
| 287 | mocha | 287 | mocha |
| 288 | pg (~> 0.17.0) | 288 | pg (~> 0.17.0) |
| 289 | poltergeist (~> 1.5.0) | 289 | poltergeist (~> 1.5.0) |
| 290 | - rails (= 4.1.2.rc1) | 290 | + rails (= 4.1.2.rc3) |
| 291 | rspec-rails (~> 2.99.0) | 291 | rspec-rails (~> 2.99.0) |
| 292 | sass-rails (~> 4.0.1) | 292 | sass-rails (~> 4.0.1) |
| 293 | sdoc | 293 | sdoc |