Commit 35c3bc7047f8b43b6c42579c15d774820c089b3a
1 parent
70c5e3e3
Exists in
colab
and in
4 other branches
rails updated
Showing
2 changed files
with
34 additions
and
34 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.2.0' | 4 | +gem 'rails', '4.2.1' |
| 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
| @@ -12,36 +12,36 @@ GIT | @@ -12,36 +12,36 @@ GIT | ||
| 12 | GEM | 12 | GEM |
| 13 | remote: https://rubygems.org/ | 13 | remote: https://rubygems.org/ |
| 14 | specs: | 14 | specs: |
| 15 | - actionmailer (4.2.0) | ||
| 16 | - actionpack (= 4.2.0) | ||
| 17 | - actionview (= 4.2.0) | ||
| 18 | - activejob (= 4.2.0) | 15 | + actionmailer (4.2.1) |
| 16 | + actionpack (= 4.2.1) | ||
| 17 | + actionview (= 4.2.1) | ||
| 18 | + activejob (= 4.2.1) | ||
| 19 | mail (~> 2.5, >= 2.5.4) | 19 | mail (~> 2.5, >= 2.5.4) |
| 20 | rails-dom-testing (~> 1.0, >= 1.0.5) | 20 | rails-dom-testing (~> 1.0, >= 1.0.5) |
| 21 | - actionpack (4.2.0) | ||
| 22 | - actionview (= 4.2.0) | ||
| 23 | - activesupport (= 4.2.0) | ||
| 24 | - rack (~> 1.6.0) | 21 | + actionpack (4.2.1) |
| 22 | + actionview (= 4.2.1) | ||
| 23 | + activesupport (= 4.2.1) | ||
| 24 | + rack (~> 1.6) | ||
| 25 | rack-test (~> 0.6.2) | 25 | rack-test (~> 0.6.2) |
| 26 | rails-dom-testing (~> 1.0, >= 1.0.5) | 26 | rails-dom-testing (~> 1.0, >= 1.0.5) |
| 27 | rails-html-sanitizer (~> 1.0, >= 1.0.1) | 27 | rails-html-sanitizer (~> 1.0, >= 1.0.1) |
| 28 | - actionview (4.2.0) | ||
| 29 | - activesupport (= 4.2.0) | 28 | + actionview (4.2.1) |
| 29 | + activesupport (= 4.2.1) | ||
| 30 | builder (~> 3.1) | 30 | builder (~> 3.1) |
| 31 | erubis (~> 2.7.0) | 31 | erubis (~> 2.7.0) |
| 32 | rails-dom-testing (~> 1.0, >= 1.0.5) | 32 | rails-dom-testing (~> 1.0, >= 1.0.5) |
| 33 | rails-html-sanitizer (~> 1.0, >= 1.0.1) | 33 | rails-html-sanitizer (~> 1.0, >= 1.0.1) |
| 34 | - activejob (4.2.0) | ||
| 35 | - activesupport (= 4.2.0) | 34 | + activejob (4.2.1) |
| 35 | + activesupport (= 4.2.1) | ||
| 36 | globalid (>= 0.3.0) | 36 | globalid (>= 0.3.0) |
| 37 | - activemodel (4.2.0) | ||
| 38 | - activesupport (= 4.2.0) | 37 | + activemodel (4.2.1) |
| 38 | + activesupport (= 4.2.1) | ||
| 39 | builder (~> 3.1) | 39 | builder (~> 3.1) |
| 40 | - activerecord (4.2.0) | ||
| 41 | - activemodel (= 4.2.0) | ||
| 42 | - activesupport (= 4.2.0) | 40 | + activerecord (4.2.1) |
| 41 | + activemodel (= 4.2.1) | ||
| 42 | + activesupport (= 4.2.1) | ||
| 43 | arel (~> 6.0) | 43 | arel (~> 6.0) |
| 44 | - activesupport (4.2.0) | 44 | + activesupport (4.2.1) |
| 45 | i18n (~> 0.7) | 45 | i18n (~> 0.7) |
| 46 | json (~> 1.7, >= 1.7.7) | 46 | json (~> 1.7, >= 1.7.7) |
| 47 | minitest (~> 5.1) | 47 | minitest (~> 5.1) |
| @@ -195,28 +195,28 @@ GEM | @@ -195,28 +195,28 @@ GEM | ||
| 195 | rack (1.6.0) | 195 | rack (1.6.0) |
| 196 | rack-test (0.6.3) | 196 | rack-test (0.6.3) |
| 197 | rack (>= 1.0) | 197 | rack (>= 1.0) |
| 198 | - rails (4.2.0) | ||
| 199 | - actionmailer (= 4.2.0) | ||
| 200 | - actionpack (= 4.2.0) | ||
| 201 | - actionview (= 4.2.0) | ||
| 202 | - activejob (= 4.2.0) | ||
| 203 | - activemodel (= 4.2.0) | ||
| 204 | - activerecord (= 4.2.0) | ||
| 205 | - activesupport (= 4.2.0) | 198 | + rails (4.2.1) |
| 199 | + actionmailer (= 4.2.1) | ||
| 200 | + actionpack (= 4.2.1) | ||
| 201 | + actionview (= 4.2.1) | ||
| 202 | + activejob (= 4.2.1) | ||
| 203 | + activemodel (= 4.2.1) | ||
| 204 | + activerecord (= 4.2.1) | ||
| 205 | + activesupport (= 4.2.1) | ||
| 206 | bundler (>= 1.3.0, < 2.0) | 206 | bundler (>= 1.3.0, < 2.0) |
| 207 | - railties (= 4.2.0) | 207 | + railties (= 4.2.1) |
| 208 | sprockets-rails | 208 | sprockets-rails |
| 209 | rails-deprecated_sanitizer (1.0.3) | 209 | rails-deprecated_sanitizer (1.0.3) |
| 210 | activesupport (>= 4.2.0.alpha) | 210 | activesupport (>= 4.2.0.alpha) |
| 211 | - rails-dom-testing (1.0.5) | 211 | + rails-dom-testing (1.0.6) |
| 212 | activesupport (>= 4.2.0.beta, < 5.0) | 212 | activesupport (>= 4.2.0.beta, < 5.0) |
| 213 | nokogiri (~> 1.6.0) | 213 | nokogiri (~> 1.6.0) |
| 214 | rails-deprecated_sanitizer (>= 1.0.1) | 214 | rails-deprecated_sanitizer (>= 1.0.1) |
| 215 | - rails-html-sanitizer (1.0.1) | 215 | + rails-html-sanitizer (1.0.2) |
| 216 | loofah (~> 2.0) | 216 | loofah (~> 2.0) |
| 217 | - railties (4.2.0) | ||
| 218 | - actionpack (= 4.2.0) | ||
| 219 | - activesupport (= 4.2.0) | 217 | + railties (4.2.1) |
| 218 | + actionpack (= 4.2.1) | ||
| 219 | + activesupport (= 4.2.1) | ||
| 220 | rake (>= 0.8.7) | 220 | rake (>= 0.8.7) |
| 221 | thor (>= 0.18.1, < 2.0) | 221 | thor (>= 0.18.1, < 2.0) |
| 222 | rake (10.4.2) | 222 | rake (10.4.2) |
| @@ -330,7 +330,7 @@ DEPENDENCIES | @@ -330,7 +330,7 @@ DEPENDENCIES | ||
| 330 | mocha | 330 | mocha |
| 331 | pg (~> 0.18.1) | 331 | pg (~> 0.18.1) |
| 332 | poltergeist (~> 1.6.0) | 332 | poltergeist (~> 1.6.0) |
| 333 | - rails (= 4.2.0) | 333 | + rails (= 4.2.1) |
| 334 | rails-html-sanitizer (~> 1.0) | 334 | rails-html-sanitizer (~> 1.0) |
| 335 | rspec-rails (~> 3.2.0) | 335 | rspec-rails (~> 3.2.0) |
| 336 | sass-rails (~> 5.0.0) | 336 | sass-rails (~> 5.0.0) |