Skip to content

Commit b11e665

Browse files
committed
Rails 4 is now the out-of-the-box default
1 parent 9c91ddd commit b11e665

3 files changed

Lines changed: 42 additions & 46 deletions

File tree

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ end
1212

1313
module ::Kernel
1414
def rails4?
15-
!!ENV["RAILS4"]
15+
!ENV["RAILS3"]
1616
end
1717
end
1818

@@ -35,7 +35,7 @@ end
3535
gem 'seed-fu' , github: 'SamSaffron/seed-fu'
3636

3737
if rails4?
38-
gem 'rails', :git => 'git://github.com/rails/rails.git', :branch => '4-0-stable'
38+
gem 'rails'
3939
gem 'redis-rails', :git => 'git://github.com/SamSaffron/redis-store.git'
4040
gem 'rails-observers'
4141
gem 'actionpack-action_caching'

Gemfile_rails4.lock

Lines changed: 37 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -15,48 +15,6 @@ GIT
1515
activerecord (>= 3.1, < 4.1)
1616
activesupport (>= 3.1, < 4.1)
1717

18-
GIT
19-
remote: git://github.com/rails/rails.git
20-
revision: 7b2f64fca71c8d13428eb48b65399736a8327554
21-
branch: 4-0-stable
22-
specs:
23-
actionmailer (4.0.0)
24-
actionpack (= 4.0.0)
25-
mail (~> 2.5.4)
26-
actionpack (4.0.0)
27-
activesupport (= 4.0.0)
28-
builder (~> 3.1.0)
29-
erubis (~> 2.7.0)
30-
rack (~> 1.5.2)
31-
rack-test (~> 0.6.2)
32-
activemodel (4.0.0)
33-
activesupport (= 4.0.0)
34-
builder (~> 3.1.0)
35-
activerecord (4.0.0)
36-
activemodel (= 4.0.0)
37-
activerecord-deprecated_finders (~> 1.0.2)
38-
activesupport (= 4.0.0)
39-
arel (~> 4.0.0)
40-
activesupport (4.0.0)
41-
i18n (~> 0.6, >= 0.6.4)
42-
minitest (~> 4.2)
43-
multi_json (~> 1.3)
44-
thread_safe (~> 0.1)
45-
tzinfo (~> 0.3.37)
46-
rails (4.0.0)
47-
actionmailer (= 4.0.0)
48-
actionpack (= 4.0.0)
49-
activerecord (= 4.0.0)
50-
activesupport (= 4.0.0)
51-
bundler (>= 1.3.0, < 2.0)
52-
railties (= 4.0.0)
53-
sprockets-rails (~> 2.0.0)
54-
railties (4.0.0)
55-
actionpack (= 4.0.0)
56-
activesupport (= 4.0.0)
57-
rake (>= 0.8.7)
58-
thor (>= 0.18.1, < 2.0)
59-
6018
GIT
6119
remote: git://github.com/sporkrb/spork-rails.git
6220
revision: 0dd45e59d3237b4c8f9efc215b46d9c07072a95e
@@ -153,11 +111,34 @@ PATH
153111
GEM
154112
remote: https://rubygems.org/
155113
specs:
114+
actionmailer (4.0.1)
115+
actionpack (= 4.0.1)
116+
mail (~> 2.5.4)
117+
actionpack (4.0.1)
118+
activesupport (= 4.0.1)
119+
builder (~> 3.1.0)
120+
erubis (~> 2.7.0)
121+
rack (~> 1.5.2)
122+
rack-test (~> 0.6.2)
156123
actionpack-action_caching (1.0.0)
157124
actionpack (>= 4.0.0.beta, < 5.0)
158125
active_model_serializers (0.8.1)
159126
activemodel (>= 3.0)
127+
activemodel (4.0.1)
128+
activesupport (= 4.0.1)
129+
builder (~> 3.1.0)
130+
activerecord (4.0.1)
131+
activemodel (= 4.0.1)
132+
activerecord-deprecated_finders (~> 1.0.2)
133+
activesupport (= 4.0.1)
134+
arel (~> 4.0.0)
160135
activerecord-deprecated_finders (1.0.3)
136+
activesupport (4.0.1)
137+
i18n (~> 0.6, >= 0.6.4)
138+
minitest (~> 4.2)
139+
multi_json (~> 1.3)
140+
thread_safe (~> 0.1)
141+
tzinfo (~> 0.3.37)
161142
addressable (2.3.5)
162143
airbrake (3.1.2)
163144
activesupport
@@ -334,8 +315,21 @@ GEM
334315
rack
335316
rack-test (0.6.2)
336317
rack (>= 1.0)
318+
rails (4.0.1)
319+
actionmailer (= 4.0.1)
320+
actionpack (= 4.0.1)
321+
activerecord (= 4.0.1)
322+
activesupport (= 4.0.1)
323+
bundler (>= 1.3.0, < 2.0)
324+
railties (= 4.0.1)
325+
sprockets-rails (~> 2.0.0)
337326
rails-observers (0.1.2)
338327
activemodel (~> 4.0)
328+
railties (4.0.1)
329+
actionpack (= 4.0.1)
330+
activesupport (= 4.0.1)
331+
rake (>= 0.8.7)
332+
thor (>= 0.18.1, < 2.0)
339333
raindrops (0.12.0)
340334
rake (10.1.0)
341335
rake-compiler (0.9.1)
@@ -518,7 +512,7 @@ DEPENDENCIES
518512
rack-cors
519513
rack-mini-profiler!
520514
rack-protection
521-
rails!
515+
rails
522516
rails-observers
523517
rails_multisite!
524518
rake

lib/tasks/assets.rake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ task 'assets:precompile' => 'environment' do
44
# this breaks stuff like the emoji plugin. We could fix it,
55
# but its a major pain with little benefit.
66
if rails4?
7-
puts "Copying non-digested versions of assets"
7+
puts "> Copying non-digested versions of assets"
88
assets = Dir.glob(File.join(Rails.root, 'public/assets/**/*'))
99
regex = /(-{1}[a-z0-9]{32}*\.{1}){1}/
1010
assets.each do |file|
@@ -16,5 +16,7 @@ task 'assets:precompile' => 'environment' do
1616
non_digested = File.join(source)
1717
FileUtils.cp(file, non_digested)
1818
end
19+
puts "> Removing cache"
20+
`rm -fr tmp/cache`
1921
end
2022
end

0 commit comments

Comments
 (0)