mirror of
https://github.com/discourse/discourse.git
synced 2024-11-22 12:12:26 +08:00
DEV: Use the release version of sprockets (#26490)
This commit is contained in:
parent
bc06aab4c4
commit
49409f4985
2
Gemfile
2
Gemfile
|
@ -19,7 +19,7 @@ gem "json"
|
||||||
|
|
||||||
# TODO: At the moment Discourse does not work with Sprockets 4, we would need to correct internals
|
# TODO: At the moment Discourse does not work with Sprockets 4, we would need to correct internals
|
||||||
# We intend to drop sprockets rather than upgrade to 4.x
|
# We intend to drop sprockets rather than upgrade to 4.x
|
||||||
gem "sprockets", git: "https://github.com/rails/sprockets", branch: "3.x"
|
gem "sprockets", "~> 3.7.3"
|
||||||
|
|
||||||
# this will eventually be added to rails,
|
# this will eventually be added to rails,
|
||||||
# allows us to precompile all our templates in the unicorn master
|
# allows us to precompile all our templates in the unicorn master
|
||||||
|
|
16
Gemfile.lock
16
Gemfile.lock
|
@ -1,13 +1,3 @@
|
||||||
GIT
|
|
||||||
remote: https://github.com/rails/sprockets
|
|
||||||
revision: 0487291ad2527d1303f2692a558c21f38a6169f1
|
|
||||||
branch: 3.x
|
|
||||||
specs:
|
|
||||||
sprockets (3.7.3)
|
|
||||||
base64
|
|
||||||
concurrent-ruby (~> 1.0)
|
|
||||||
rack (> 1, < 3)
|
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
|
@ -483,6 +473,10 @@ GEM
|
||||||
snaky_hash (2.0.1)
|
snaky_hash (2.0.1)
|
||||||
hashie
|
hashie
|
||||||
version_gem (~> 1.1, >= 1.1.1)
|
version_gem (~> 1.1, >= 1.1.1)
|
||||||
|
sprockets (3.7.3)
|
||||||
|
base64
|
||||||
|
concurrent-ruby (~> 1.0)
|
||||||
|
rack (> 1, < 3)
|
||||||
sprockets-rails (3.4.2)
|
sprockets-rails (3.4.2)
|
||||||
actionpack (>= 5.2)
|
actionpack (>= 5.2)
|
||||||
activesupport (>= 5.2)
|
activesupport (>= 5.2)
|
||||||
|
@ -660,7 +654,7 @@ DEPENDENCIES
|
||||||
shoulda-matchers
|
shoulda-matchers
|
||||||
sidekiq
|
sidekiq
|
||||||
simplecov
|
simplecov
|
||||||
sprockets!
|
sprockets (~> 3.7.3)
|
||||||
sprockets-rails
|
sprockets-rails
|
||||||
sqlite3
|
sqlite3
|
||||||
sshkey
|
sshkey
|
||||||
|
|
Loading…
Reference in New Issue
Block a user