Rails 4 is now the out-of-the-box default
This commit is contained in:
parent
9c91ddd854
commit
b11e665ecc
4
Gemfile
4
Gemfile
|
@ -12,7 +12,7 @@ end
|
||||||
|
|
||||||
module ::Kernel
|
module ::Kernel
|
||||||
def rails4?
|
def rails4?
|
||||||
!!ENV["RAILS4"]
|
!ENV["RAILS3"]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ end
|
||||||
gem 'seed-fu' , github: 'SamSaffron/seed-fu'
|
gem 'seed-fu' , github: 'SamSaffron/seed-fu'
|
||||||
|
|
||||||
if rails4?
|
if rails4?
|
||||||
gem 'rails', :git => 'git://github.com/rails/rails.git', :branch => '4-0-stable'
|
gem 'rails'
|
||||||
gem 'redis-rails', :git => 'git://github.com/SamSaffron/redis-store.git'
|
gem 'redis-rails', :git => 'git://github.com/SamSaffron/redis-store.git'
|
||||||
gem 'rails-observers'
|
gem 'rails-observers'
|
||||||
gem 'actionpack-action_caching'
|
gem 'actionpack-action_caching'
|
||||||
|
|
|
@ -15,48 +15,6 @@ GIT
|
||||||
activerecord (>= 3.1, < 4.1)
|
activerecord (>= 3.1, < 4.1)
|
||||||
activesupport (>= 3.1, < 4.1)
|
activesupport (>= 3.1, < 4.1)
|
||||||
|
|
||||||
GIT
|
|
||||||
remote: git://github.com/rails/rails.git
|
|
||||||
revision: 7b2f64fca71c8d13428eb48b65399736a8327554
|
|
||||||
branch: 4-0-stable
|
|
||||||
specs:
|
|
||||||
actionmailer (4.0.0)
|
|
||||||
actionpack (= 4.0.0)
|
|
||||||
mail (~> 2.5.4)
|
|
||||||
actionpack (4.0.0)
|
|
||||||
activesupport (= 4.0.0)
|
|
||||||
builder (~> 3.1.0)
|
|
||||||
erubis (~> 2.7.0)
|
|
||||||
rack (~> 1.5.2)
|
|
||||||
rack-test (~> 0.6.2)
|
|
||||||
activemodel (4.0.0)
|
|
||||||
activesupport (= 4.0.0)
|
|
||||||
builder (~> 3.1.0)
|
|
||||||
activerecord (4.0.0)
|
|
||||||
activemodel (= 4.0.0)
|
|
||||||
activerecord-deprecated_finders (~> 1.0.2)
|
|
||||||
activesupport (= 4.0.0)
|
|
||||||
arel (~> 4.0.0)
|
|
||||||
activesupport (4.0.0)
|
|
||||||
i18n (~> 0.6, >= 0.6.4)
|
|
||||||
minitest (~> 4.2)
|
|
||||||
multi_json (~> 1.3)
|
|
||||||
thread_safe (~> 0.1)
|
|
||||||
tzinfo (~> 0.3.37)
|
|
||||||
rails (4.0.0)
|
|
||||||
actionmailer (= 4.0.0)
|
|
||||||
actionpack (= 4.0.0)
|
|
||||||
activerecord (= 4.0.0)
|
|
||||||
activesupport (= 4.0.0)
|
|
||||||
bundler (>= 1.3.0, < 2.0)
|
|
||||||
railties (= 4.0.0)
|
|
||||||
sprockets-rails (~> 2.0.0)
|
|
||||||
railties (4.0.0)
|
|
||||||
actionpack (= 4.0.0)
|
|
||||||
activesupport (= 4.0.0)
|
|
||||||
rake (>= 0.8.7)
|
|
||||||
thor (>= 0.18.1, < 2.0)
|
|
||||||
|
|
||||||
GIT
|
GIT
|
||||||
remote: git://github.com/sporkrb/spork-rails.git
|
remote: git://github.com/sporkrb/spork-rails.git
|
||||||
revision: 0dd45e59d3237b4c8f9efc215b46d9c07072a95e
|
revision: 0dd45e59d3237b4c8f9efc215b46d9c07072a95e
|
||||||
|
@ -153,11 +111,34 @@ PATH
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
|
actionmailer (4.0.1)
|
||||||
|
actionpack (= 4.0.1)
|
||||||
|
mail (~> 2.5.4)
|
||||||
|
actionpack (4.0.1)
|
||||||
|
activesupport (= 4.0.1)
|
||||||
|
builder (~> 3.1.0)
|
||||||
|
erubis (~> 2.7.0)
|
||||||
|
rack (~> 1.5.2)
|
||||||
|
rack-test (~> 0.6.2)
|
||||||
actionpack-action_caching (1.0.0)
|
actionpack-action_caching (1.0.0)
|
||||||
actionpack (>= 4.0.0.beta, < 5.0)
|
actionpack (>= 4.0.0.beta, < 5.0)
|
||||||
active_model_serializers (0.8.1)
|
active_model_serializers (0.8.1)
|
||||||
activemodel (>= 3.0)
|
activemodel (>= 3.0)
|
||||||
|
activemodel (4.0.1)
|
||||||
|
activesupport (= 4.0.1)
|
||||||
|
builder (~> 3.1.0)
|
||||||
|
activerecord (4.0.1)
|
||||||
|
activemodel (= 4.0.1)
|
||||||
|
activerecord-deprecated_finders (~> 1.0.2)
|
||||||
|
activesupport (= 4.0.1)
|
||||||
|
arel (~> 4.0.0)
|
||||||
activerecord-deprecated_finders (1.0.3)
|
activerecord-deprecated_finders (1.0.3)
|
||||||
|
activesupport (4.0.1)
|
||||||
|
i18n (~> 0.6, >= 0.6.4)
|
||||||
|
minitest (~> 4.2)
|
||||||
|
multi_json (~> 1.3)
|
||||||
|
thread_safe (~> 0.1)
|
||||||
|
tzinfo (~> 0.3.37)
|
||||||
addressable (2.3.5)
|
addressable (2.3.5)
|
||||||
airbrake (3.1.2)
|
airbrake (3.1.2)
|
||||||
activesupport
|
activesupport
|
||||||
|
@ -334,8 +315,21 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
|
rails (4.0.1)
|
||||||
|
actionmailer (= 4.0.1)
|
||||||
|
actionpack (= 4.0.1)
|
||||||
|
activerecord (= 4.0.1)
|
||||||
|
activesupport (= 4.0.1)
|
||||||
|
bundler (>= 1.3.0, < 2.0)
|
||||||
|
railties (= 4.0.1)
|
||||||
|
sprockets-rails (~> 2.0.0)
|
||||||
rails-observers (0.1.2)
|
rails-observers (0.1.2)
|
||||||
activemodel (~> 4.0)
|
activemodel (~> 4.0)
|
||||||
|
railties (4.0.1)
|
||||||
|
actionpack (= 4.0.1)
|
||||||
|
activesupport (= 4.0.1)
|
||||||
|
rake (>= 0.8.7)
|
||||||
|
thor (>= 0.18.1, < 2.0)
|
||||||
raindrops (0.12.0)
|
raindrops (0.12.0)
|
||||||
rake (10.1.0)
|
rake (10.1.0)
|
||||||
rake-compiler (0.9.1)
|
rake-compiler (0.9.1)
|
||||||
|
@ -518,7 +512,7 @@ DEPENDENCIES
|
||||||
rack-cors
|
rack-cors
|
||||||
rack-mini-profiler!
|
rack-mini-profiler!
|
||||||
rack-protection
|
rack-protection
|
||||||
rails!
|
rails
|
||||||
rails-observers
|
rails-observers
|
||||||
rails_multisite!
|
rails_multisite!
|
||||||
rake
|
rake
|
||||||
|
|
|
@ -4,7 +4,7 @@ task 'assets:precompile' => 'environment' do
|
||||||
# this breaks stuff like the emoji plugin. We could fix it,
|
# this breaks stuff like the emoji plugin. We could fix it,
|
||||||
# but its a major pain with little benefit.
|
# but its a major pain with little benefit.
|
||||||
if rails4?
|
if rails4?
|
||||||
puts "Copying non-digested versions of assets"
|
puts "> Copying non-digested versions of assets"
|
||||||
assets = Dir.glob(File.join(Rails.root, 'public/assets/**/*'))
|
assets = Dir.glob(File.join(Rails.root, 'public/assets/**/*'))
|
||||||
regex = /(-{1}[a-z0-9]{32}*\.{1}){1}/
|
regex = /(-{1}[a-z0-9]{32}*\.{1}){1}/
|
||||||
assets.each do |file|
|
assets.each do |file|
|
||||||
|
@ -16,5 +16,7 @@ task 'assets:precompile' => 'environment' do
|
||||||
non_digested = File.join(source)
|
non_digested = File.join(source)
|
||||||
FileUtils.cp(file, non_digested)
|
FileUtils.cp(file, non_digested)
|
||||||
end
|
end
|
||||||
|
puts "> Removing cache"
|
||||||
|
`rm -fr tmp/cache`
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue