Skip to content

Commit 0c7c35c

Browse files
committed
update to Rails 4.1.4
1 parent a0bf25f commit 0c7c35c

File tree

5 files changed

+47
-40
lines changed

5 files changed

+47
-40
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22
ruby '2.1.2'
3-
gem 'rails', '4.1.1'
3+
gem 'rails', '4.1.4'
44
gem 'sqlite3'
55
gem 'sass-rails', '~> 4.0.3'
66
gem 'uglifier', '>= 1.3.0'

Gemfile.lock

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.1.1)
5-
actionpack (= 4.1.1)
6-
actionview (= 4.1.1)
4+
actionmailer (4.1.4)
5+
actionpack (= 4.1.4)
6+
actionview (= 4.1.4)
77
mail (~> 2.5.4)
8-
actionpack (4.1.1)
9-
actionview (= 4.1.1)
10-
activesupport (= 4.1.1)
8+
actionpack (4.1.4)
9+
actionview (= 4.1.4)
10+
activesupport (= 4.1.4)
1111
rack (~> 1.5.2)
1212
rack-test (~> 0.6.2)
13-
actionview (4.1.1)
14-
activesupport (= 4.1.1)
13+
actionview (4.1.4)
14+
activesupport (= 4.1.4)
1515
builder (~> 3.1)
1616
erubis (~> 2.7.0)
17-
activemodel (4.1.1)
18-
activesupport (= 4.1.1)
17+
activemodel (4.1.4)
18+
activesupport (= 4.1.4)
1919
builder (~> 3.1)
20-
activerecord (4.1.1)
21-
activemodel (= 4.1.1)
22-
activesupport (= 4.1.1)
20+
activerecord (4.1.4)
21+
activemodel (= 4.1.4)
22+
activesupport (= 4.1.4)
2323
arel (~> 5.0.0)
24-
activesupport (4.1.1)
24+
activesupport (4.1.4)
2525
i18n (~> 0.6, >= 0.6.9)
2626
json (~> 1.7, >= 1.7.7)
2727
minitest (~> 5.1)
@@ -34,10 +34,10 @@ GEM
3434
erubis (>= 2.6.6)
3535
binding_of_caller (0.7.2)
3636
debug_inspector (>= 0.0.1)
37-
bootstrap-sass (3.1.1.1)
37+
bootstrap-sass (3.2.0.0)
3838
sass (~> 3.2)
3939
builder (3.2.2)
40-
capybara (2.3.0)
40+
capybara (2.4.1)
4141
mime-types (>= 1.16)
4242
nokogiri (>= 1.3.3)
4343
rack (>= 1.0.0)
@@ -57,22 +57,22 @@ GEM
5757
debug_inspector (0.0.2)
5858
diff-lcs (1.2.5)
5959
erubis (2.7.0)
60-
execjs (2.2.0)
60+
execjs (2.2.1)
6161
factory_girl (4.4.0)
6262
activesupport (>= 3.0.0)
6363
factory_girl_rails (4.4.1)
6464
factory_girl (~> 4.4.0)
6565
railties (>= 3.0.0)
66-
faker (1.3.0)
66+
faker (1.4.1)
6767
i18n (~> 0.5)
6868
ffi (1.9.3)
69-
high_voltage (2.1.0)
69+
high_voltage (2.2.0)
7070
hike (1.2.3)
7171
i18n (0.6.9)
72-
jbuilder (2.1.1)
72+
jbuilder (2.1.2)
7373
activesupport (>= 3.0.0, < 5)
7474
multi_json (~> 1.2)
75-
jquery-rails (3.1.0)
75+
jquery-rails (3.1.1)
7676
railties (>= 3.0, < 5.0)
7777
thor (>= 0.14, < 2.0)
7878
json (1.8.1)
@@ -83,7 +83,7 @@ GEM
8383
treetop (~> 1.4.8)
8484
mime-types (1.25.1)
8585
mini_portile (0.6.0)
86-
minitest (5.3.5)
86+
minitest (5.4.0)
8787
multi_json (1.10.1)
8888
nokogiri (1.6.2.1)
8989
mini_portile (= 0.6.0)
@@ -93,20 +93,20 @@ GEM
9393
rack (1.5.2)
9494
rack-test (0.6.2)
9595
rack (>= 1.0)
96-
rails (4.1.1)
97-
actionmailer (= 4.1.1)
98-
actionpack (= 4.1.1)
99-
actionview (= 4.1.1)
100-
activemodel (= 4.1.1)
101-
activerecord (= 4.1.1)
102-
activesupport (= 4.1.1)
96+
rails (4.1.4)
97+
actionmailer (= 4.1.4)
98+
actionpack (= 4.1.4)
99+
actionview (= 4.1.4)
100+
activemodel (= 4.1.4)
101+
activerecord (= 4.1.4)
102+
activesupport (= 4.1.4)
103103
bundler (>= 1.3.0, < 2.0)
104-
railties (= 4.1.1)
104+
railties (= 4.1.4)
105105
sprockets-rails (~> 2.0)
106106
rails_layout (1.0.20)
107-
railties (4.1.1)
108-
actionpack (= 4.1.1)
109-
activesupport (= 4.1.1)
107+
railties (4.1.4)
108+
actionpack (= 4.1.4)
109+
activesupport (= 4.1.4)
110110
rake (>= 0.8.7)
111111
thor (>= 0.18.1, < 2.0)
112112
rake (10.3.2)
@@ -127,8 +127,8 @@ GEM
127127
rspec-expectations (~> 3.0.0)
128128
rspec-mocks (~> 3.0.0)
129129
rspec-support (~> 3.0.0)
130-
rspec-support (3.0.1)
131-
rubyzip (1.1.4)
130+
rspec-support (3.0.2)
131+
rubyzip (1.1.6)
132132
sass (3.2.19)
133133
sass-rails (4.0.3)
134134
railties (>= 4.0.0, < 5.0)
@@ -188,7 +188,7 @@ DEPENDENCIES
188188
jquery-rails
189189
launchy
190190
quiet_assets
191-
rails (= 4.1.1)
191+
rails (= 4.1.4)
192192
rails_layout
193193
rspec-rails
194194
sass-rails (~> 4.0.3)

config/environments/production.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
# Generate digests for assets URLs.
3333
config.assets.digest = true
3434

35-
# Version of your assets, change this if you want to expire all your assets.
36-
config.assets.version = '1.0'
35+
# `config.assets.precompile` has moved to config/initializers/assets.rb
3736

3837
# Specifies the header that your server uses for sending files.
3938
# config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache

config/initializers/assets.rb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Be sure to restart your server when you modify this file.
2+
3+
# Version of your assets, change this if you want to expire all your assets.
4+
Rails.application.config.assets.version = '1.0'
5+
6+
# Precompile additional assets.
7+
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
8+
# Rails.application.config.assets.precompile += %w( search.js )

config/routes.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Rails.application.routes.draw do
2-
root :to => "visitors#index"
2+
root to: 'visitors#index'
33
end

0 commit comments

Comments
 (0)