diff --git a/Gemfile b/Gemfile index 3c631b37c89..f92ce52df59 100644 --- a/Gemfile +++ b/Gemfile @@ -127,14 +127,7 @@ gem 'rack-protection' # security # in production environments by default. # allow everywhere for now cause we are allowing asset debugging in prd group :assets do - - if rails_master? - gem 'sass-rails', git: 'https://github.com/rails/sass-rails.git' - else - # later is breaking our asset compliation extensions - gem 'sass-rails', '4.0.2' - end - + gem 'sass-rails', '~> 4.0.5' gem 'uglifier' gem 'rtlit', require: false # for css rtling end diff --git a/Gemfile.lock b/Gemfile.lock index 94a9bd75f81..a8d764283a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -378,14 +378,14 @@ GEM nokogiri (>= 1.4.4) nokogumbo (= 1.2.0) sass (3.2.19) - sass-rails (4.0.2) + sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) sass (~> 3.2.0) sprockets (~> 2.8, <= 2.11.0) sprockets-rails (~> 2.0.0) - seed-fu (2.3.3) - activerecord (>= 3.1, < 4.2) - activesupport (>= 3.1, < 4.2) + seed-fu (2.3.5) + activerecord (>= 3.1, < 4.3) + activesupport (>= 3.1, < 4.3) shoulda (3.5.0) shoulda-context (~> 1.0, >= 1.0.1) shoulda-matchers (>= 1.4.1, < 3.0) @@ -536,7 +536,7 @@ DEPENDENCIES ruby-readability sanitize sass - sass-rails (= 4.0.2) + sass-rails (~> 4.0.5) seed-fu (~> 2.3.3) shoulda sidekiq