diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-07-24 14:59:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-24 14:59:42 -0400 |
| commit | 998ec40f9e69616fbc813aab072711582b7c155c (patch) | |
| tree | 2d54370bb30a77997907bb530439f90251a24c41 | |
| parent | 06dff4d7da6bfec842e94e1585cd1af9d048e6a4 (diff) | |
| parent | 0c2c32d3d699e211adb458e60733f042b64c3cc1 (diff) | |
| download | rails-998ec40f9e69616fbc813aab072711582b7c155c.tar.gz rails-998ec40f9e69616fbc813aab072711582b7c155c.tar.bz2 rails-998ec40f9e69616fbc813aab072711582b7c155c.zip | |
Merge pull request #29908 from deivid-rodriguez/fix_warnings_in_railties_tests
Fix warnings in railties tests
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 30 |
2 files changed, 21 insertions, 11 deletions
@@ -22,7 +22,7 @@ gem "capybara", "~> 2.13" gem "rack-cache", "~> 1.2" gem "jquery-rails" gem "coffee-rails" -gem "sass-rails" +gem "sass-rails", github: "rails/sass-rails", branch: "5-0-stable" gem "turbolinks", "~> 5" # require: false so bcrypt is loaded only when has_secure_password is used. diff --git a/Gemfile.lock b/Gemfile.lock index 3c6eafaf42..995aa9f7ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,6 +35,18 @@ GIT specs: arel (8.0.0) +GIT + remote: https://github.com/rails/sass-rails.git + revision: bb5c1d34e8acad2e2960cc785184ffe17d7b3bca + branch: 5-0-stable + specs: + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + PATH remote: . specs: @@ -305,13 +317,11 @@ GEM rubyzip (1.2.0) rufus-scheduler (3.3.2) tzinfo - sass (3.4.23) - sass-rails (5.0.6) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) + sass (3.5.1) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sdoc (1.0.0.rc2) rdoc (~> 5.0) selenium-webdriver (3.0.5) @@ -355,7 +365,7 @@ GEM rack (>= 1, < 3) thread (0.1.7) thread_safe (0.3.6) - tilt (2.0.5) + tilt (2.0.8) turbolinks (5.0.1) turbolinks-source (~> 5) turbolinks-source (5.0.0) @@ -430,7 +440,7 @@ DEPENDENCIES resque resque-scheduler rubocop (>= 0.47) - sass-rails + sass-rails! sdoc (> 1.0.0.rc1, < 2.0) sequel sidekiq @@ -448,4 +458,4 @@ DEPENDENCIES websocket-client-simple! BUNDLED WITH - 1.15.1 + 1.15.3 |