Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump to sass-rails 4.0.5 for Rails 4.2 support

This commit is contained in:
Godfrey Chan 2015-04-23 17:19:55 -04:00 committed by Arthur Neves
parent 233f56b6aa
commit 0887f33d77
No known key found for this signature in database
GPG Key ID: 04A390FB1E433E17
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Gemfile
View File

@ -127,14 +127,7 @@ gem 'rack-protection' # security
# in production environments by default. # in production environments by default.
# allow everywhere for now cause we are allowing asset debugging in prd # allow everywhere for now cause we are allowing asset debugging in prd
group :assets do group :assets do
gem 'sass-rails', '~> 4.0.5'
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 'uglifier' gem 'uglifier'
gem 'rtlit', require: false # for css rtling gem 'rtlit', require: false # for css rtling
end end

10
Gemfile.lock
View File

@ -378,14 +378,14 @@ GEM
nokogiri (>= 1.4.4) nokogiri (>= 1.4.4)
nokogumbo (= 1.2.0) nokogumbo (= 1.2.0)
sass (3.2.19) sass (3.2.19)
sass-rails (4.0.2) sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0) sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0) sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0.0) sprockets-rails (~> 2.0.0)
seed-fu (2.3.3) seed-fu (2.3.5)
activerecord (>= 3.1, < 4.2) activerecord (>= 3.1, < 4.3)
activesupport (>= 3.1, < 4.2) activesupport (>= 3.1, < 4.3)
shoulda (3.5.0) shoulda (3.5.0)
shoulda-context (~> 1.0, >= 1.0.1) shoulda-context (~> 1.0, >= 1.0.1)
shoulda-matchers (>= 1.4.1, < 3.0) shoulda-matchers (>= 1.4.1, < 3.0)
@ -536,7 +536,7 @@ DEPENDENCIES
ruby-readability ruby-readability
sanitize sanitize
sass sass
sass-rails (= 4.0.2) sass-rails (~> 4.0.5)
seed-fu (~> 2.3.3) seed-fu (~> 2.3.3)
shoulda shoulda
sidekiq sidekiq