diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-05-08 15:00:20 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-05-08 15:28:07 +0200 |
| commit | ad5a982d841f572e4e9207ae5ac6a0013648d30e (patch) | |
| tree | 5d0d4c7563d114c7d89b3e43689447fceb762281 | |
| parent | 5014a5b7d51f329311b80f8c0770b11616812120 (diff) | |
| download | gitlab-ce-ad5a982d841f572e4e9207ae5ac6a0013648d30e.tar.gz | |
Update sass-rails with newer version of rails.
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 13 |
2 files changed, 8 insertions, 7 deletions
@@ -152,7 +152,7 @@ gem "rack-attack" # Ace editor gem 'ace-rails-ap' -gem "sass-rails" +gem "sass-rails", '~> 4.0.2' gem "coffee-rails" gem "uglifier" gem "therubyracer" diff --git a/Gemfile.lock b/Gemfile.lock index 20fcc3964a3..c04c1e2b565 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -427,11 +427,12 @@ GEM safe_yaml (0.9.7) sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.2.12) - sass-rails (4.0.1) + sass (3.2.19) + sass-rails (4.0.3) railties (>= 4.0.0, < 5.0) - sass (>= 3.1.10) - sprockets-rails (~> 2.0.0) + sass (~> 3.2.0) + sprockets (~> 2.8, <= 2.11.0) + sprockets-rails (~> 2.0) sdoc (0.3.20) json (>= 1.1.3) rdoc (~> 3.10) @@ -478,7 +479,7 @@ GEM spring (>= 0.9.1) spring-commands-spinach (1.0.0) spring (>= 0.9.1) - sprockets (2.12.1) + sprockets (2.11.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -636,7 +637,7 @@ DEPENDENCIES redis-rails rspec-rails sanitize (~> 2.0) - sass-rails + sass-rails (~> 4.0.2) sdoc seed-fu select2-rails |