Commit ea0cda268668c94859f8db4802ef4b6e7068a6a0
Committed by
Diego Camarinha
Diego Camarinha
1 parent
4e110efe
Exists in
colab
and in
4 other branches
Updated to rails 4.2.4
Showing
2 changed files
with
33 additions
and
33 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.2' | 4 | +gem 'rails', '4.2.4' |
| 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,36 +11,36 @@ GIT | @@ -11,36 +11,36 @@ GIT | ||
| 11 | GEM | 11 | GEM |
| 12 | remote: https://rubygems.org/ | 12 | remote: https://rubygems.org/ |
| 13 | specs: | 13 | specs: |
| 14 | - actionmailer (4.2.2) | ||
| 15 | - actionpack (= 4.2.2) | ||
| 16 | - actionview (= 4.2.2) | ||
| 17 | - activejob (= 4.2.2) | 14 | + actionmailer (4.2.4) |
| 15 | + actionpack (= 4.2.4) | ||
| 16 | + actionview (= 4.2.4) | ||
| 17 | + activejob (= 4.2.4) | ||
| 18 | mail (~> 2.5, >= 2.5.4) | 18 | mail (~> 2.5, >= 2.5.4) |
| 19 | rails-dom-testing (~> 1.0, >= 1.0.5) | 19 | rails-dom-testing (~> 1.0, >= 1.0.5) |
| 20 | - actionpack (4.2.2) | ||
| 21 | - actionview (= 4.2.2) | ||
| 22 | - activesupport (= 4.2.2) | 20 | + actionpack (4.2.4) |
| 21 | + actionview (= 4.2.4) | ||
| 22 | + activesupport (= 4.2.4) | ||
| 23 | rack (~> 1.6) | 23 | rack (~> 1.6) |
| 24 | rack-test (~> 0.6.2) | 24 | rack-test (~> 0.6.2) |
| 25 | rails-dom-testing (~> 1.0, >= 1.0.5) | 25 | rails-dom-testing (~> 1.0, >= 1.0.5) |
| 26 | - rails-html-sanitizer (~> 1.0, >= 1.0.1) | ||
| 27 | - actionview (4.2.2) | ||
| 28 | - activesupport (= 4.2.2) | 26 | + rails-html-sanitizer (~> 1.0, >= 1.0.2) |
| 27 | + actionview (4.2.4) | ||
| 28 | + activesupport (= 4.2.4) | ||
| 29 | builder (~> 3.1) | 29 | builder (~> 3.1) |
| 30 | erubis (~> 2.7.0) | 30 | erubis (~> 2.7.0) |
| 31 | rails-dom-testing (~> 1.0, >= 1.0.5) | 31 | rails-dom-testing (~> 1.0, >= 1.0.5) |
| 32 | - rails-html-sanitizer (~> 1.0, >= 1.0.1) | ||
| 33 | - activejob (4.2.2) | ||
| 34 | - activesupport (= 4.2.2) | 32 | + rails-html-sanitizer (~> 1.0, >= 1.0.2) |
| 33 | + activejob (4.2.4) | ||
| 34 | + activesupport (= 4.2.4) | ||
| 35 | globalid (>= 0.3.0) | 35 | globalid (>= 0.3.0) |
| 36 | - activemodel (4.2.2) | ||
| 37 | - activesupport (= 4.2.2) | 36 | + activemodel (4.2.4) |
| 37 | + activesupport (= 4.2.4) | ||
| 38 | builder (~> 3.1) | 38 | builder (~> 3.1) |
| 39 | - activerecord (4.2.2) | ||
| 40 | - activemodel (= 4.2.2) | ||
| 41 | - activesupport (= 4.2.2) | 39 | + activerecord (4.2.4) |
| 40 | + activemodel (= 4.2.4) | ||
| 41 | + activesupport (= 4.2.4) | ||
| 42 | arel (~> 6.0) | 42 | arel (~> 6.0) |
| 43 | - activesupport (4.2.2) | 43 | + activesupport (4.2.4) |
| 44 | i18n (~> 0.7) | 44 | i18n (~> 0.7) |
| 45 | json (~> 1.7, >= 1.7.7) | 45 | json (~> 1.7, >= 1.7.7) |
| 46 | minitest (~> 5.1) | 46 | minitest (~> 5.1) |
| @@ -213,16 +213,16 @@ GEM | @@ -213,16 +213,16 @@ GEM | ||
| 213 | rack (1.6.4) | 213 | rack (1.6.4) |
| 214 | rack-test (0.6.3) | 214 | rack-test (0.6.3) |
| 215 | rack (>= 1.0) | 215 | rack (>= 1.0) |
| 216 | - rails (4.2.2) | ||
| 217 | - actionmailer (= 4.2.2) | ||
| 218 | - actionpack (= 4.2.2) | ||
| 219 | - actionview (= 4.2.2) | ||
| 220 | - activejob (= 4.2.2) | ||
| 221 | - activemodel (= 4.2.2) | ||
| 222 | - activerecord (= 4.2.2) | ||
| 223 | - activesupport (= 4.2.2) | 216 | + rails (4.2.4) |
| 217 | + actionmailer (= 4.2.4) | ||
| 218 | + actionpack (= 4.2.4) | ||
| 219 | + actionview (= 4.2.4) | ||
| 220 | + activejob (= 4.2.4) | ||
| 221 | + activemodel (= 4.2.4) | ||
| 222 | + activerecord (= 4.2.4) | ||
| 223 | + activesupport (= 4.2.4) | ||
| 224 | bundler (>= 1.3.0, < 2.0) | 224 | bundler (>= 1.3.0, < 2.0) |
| 225 | - railties (= 4.2.2) | 225 | + railties (= 4.2.4) |
| 226 | sprockets-rails | 226 | sprockets-rails |
| 227 | rails-deprecated_sanitizer (1.0.3) | 227 | rails-deprecated_sanitizer (1.0.3) |
| 228 | activesupport (>= 4.2.0.alpha) | 228 | activesupport (>= 4.2.0.alpha) |
| @@ -232,9 +232,9 @@ GEM | @@ -232,9 +232,9 @@ GEM | ||
| 232 | rails-deprecated_sanitizer (>= 1.0.1) | 232 | rails-deprecated_sanitizer (>= 1.0.1) |
| 233 | rails-html-sanitizer (1.0.2) | 233 | rails-html-sanitizer (1.0.2) |
| 234 | loofah (~> 2.0) | 234 | loofah (~> 2.0) |
| 235 | - railties (4.2.2) | ||
| 236 | - actionpack (= 4.2.2) | ||
| 237 | - activesupport (= 4.2.2) | 235 | + railties (4.2.4) |
| 236 | + actionpack (= 4.2.4) | ||
| 237 | + activesupport (= 4.2.4) | ||
| 238 | rake (>= 0.8.7) | 238 | rake (>= 0.8.7) |
| 239 | thor (>= 0.18.1, < 2.0) | 239 | thor (>= 0.18.1, < 2.0) |
| 240 | rake (10.4.2) | 240 | rake (10.4.2) |
| @@ -356,7 +356,7 @@ DEPENDENCIES | @@ -356,7 +356,7 @@ DEPENDENCIES | ||
| 356 | mocha | 356 | mocha |
| 357 | pg (~> 0.18.1) | 357 | pg (~> 0.18.1) |
| 358 | poltergeist (~> 1.6.0) | 358 | poltergeist (~> 1.6.0) |
| 359 | - rails (= 4.2.2) | 359 | + rails (= 4.2.4) |
| 360 | rails-html-sanitizer (~> 1.0) | 360 | rails-html-sanitizer (~> 1.0) |
| 361 | rspec-rails (~> 3.3.2) | 361 | rspec-rails (~> 3.3.2) |
| 362 | sass-rails (~> 5.0.0) | 362 | sass-rails (~> 5.0.0) |