diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f8b7e7ce9f..304e44112d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,10 +31,22 @@ GIT GIT remote: https://github.com/rails/arel.git - revision: 67a51c62f4e19390cd8eb408596ca48bb0806362 + revision: 7a29220c689feb0581e21d5324b85fc2f201ac5e 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: @@ -313,12 +325,6 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - 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) sdoc (1.0.0.rc2) rdoc (~> 5.0) selenium-webdriver (3.4.4) @@ -364,7 +370,7 @@ GEM rack (>= 1, < 3) thread (0.1.7) thread_safe (0.3.6) - tilt (2.0.7) + tilt (2.0.8) turbolinks (5.0.1) turbolinks-source (~> 5) turbolinks-source (5.0.3) @@ -439,7 +445,7 @@ DEPENDENCIES resque resque-scheduler rubocop (>= 0.47) - sass-rails + sass-rails! sdoc (> 1.0.0.rc1, < 2.0) sequel sidekiq @@ -457,4 +463,4 @@ DEPENDENCIES websocket-client-simple! BUNDLED WITH - 1.15.2 + 1.15.3 |