Skip to content

Commit 28244fa

Browse files
committed
update to Rails 4.1.4
1 parent d98dc60 commit 28244fa

File tree

5 files changed

+46
-39
lines changed

5 files changed

+46
-39
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: 35 additions & 35 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)
@@ -35,7 +35,7 @@ GEM
3535
binding_of_caller (0.7.2)
3636
debug_inspector (>= 0.0.1)
3737
builder (3.2.2)
38-
capybara (2.3.0)
38+
capybara (2.4.1)
3939
mime-types (>= 1.16)
4040
nokogiri (>= 1.3.3)
4141
rack (>= 1.0.0)
@@ -55,25 +55,25 @@ GEM
5555
debug_inspector (0.0.2)
5656
diff-lcs (1.2.5)
5757
erubis (2.7.0)
58-
execjs (2.2.0)
58+
execjs (2.2.1)
5959
factory_girl (4.4.0)
6060
activesupport (>= 3.0.0)
6161
factory_girl_rails (4.4.1)
6262
factory_girl (~> 4.4.0)
6363
railties (>= 3.0.0)
64-
faker (1.3.0)
64+
faker (1.4.1)
6565
i18n (~> 0.5)
6666
ffi (1.9.3)
6767
foundation-rails (5.3.0.1)
6868
railties (>= 3.1.0)
6969
sass (>= 3.2.0)
70-
high_voltage (2.1.0)
70+
high_voltage (2.2.0)
7171
hike (1.2.3)
7272
i18n (0.6.9)
73-
jbuilder (2.1.1)
73+
jbuilder (2.1.2)
7474
activesupport (>= 3.0.0, < 5)
7575
multi_json (~> 1.2)
76-
jquery-rails (3.1.0)
76+
jquery-rails (3.1.1)
7777
railties (>= 3.0, < 5.0)
7878
thor (>= 0.14, < 2.0)
7979
json (1.8.1)
@@ -84,7 +84,7 @@ GEM
8484
treetop (~> 1.4.8)
8585
mime-types (1.25.1)
8686
mini_portile (0.6.0)
87-
minitest (5.3.5)
87+
minitest (5.4.0)
8888
multi_json (1.10.1)
8989
nokogiri (1.6.2.1)
9090
mini_portile (= 0.6.0)
@@ -94,20 +94,20 @@ GEM
9494
rack (1.5.2)
9595
rack-test (0.6.2)
9696
rack (>= 1.0)
97-
rails (4.1.1)
98-
actionmailer (= 4.1.1)
99-
actionpack (= 4.1.1)
100-
actionview (= 4.1.1)
101-
activemodel (= 4.1.1)
102-
activerecord (= 4.1.1)
103-
activesupport (= 4.1.1)
97+
rails (4.1.4)
98+
actionmailer (= 4.1.4)
99+
actionpack (= 4.1.4)
100+
actionview (= 4.1.4)
101+
activemodel (= 4.1.4)
102+
activerecord (= 4.1.4)
103+
activesupport (= 4.1.4)
104104
bundler (>= 1.3.0, < 2.0)
105-
railties (= 4.1.1)
105+
railties (= 4.1.4)
106106
sprockets-rails (~> 2.0)
107107
rails_layout (1.0.20)
108-
railties (4.1.1)
109-
actionpack (= 4.1.1)
110-
activesupport (= 4.1.1)
108+
railties (4.1.4)
109+
actionpack (= 4.1.4)
110+
activesupport (= 4.1.4)
111111
rake (>= 0.8.7)
112112
thor (>= 0.18.1, < 2.0)
113113
rake (10.3.2)
@@ -128,8 +128,8 @@ GEM
128128
rspec-expectations (~> 3.0.0)
129129
rspec-mocks (~> 3.0.0)
130130
rspec-support (~> 3.0.0)
131-
rspec-support (3.0.1)
132-
rubyzip (1.1.4)
131+
rspec-support (3.0.2)
132+
rubyzip (1.1.6)
133133
sass (3.2.19)
134134
sass-rails (4.0.3)
135135
railties (>= 4.0.0, < 5.0)
@@ -189,7 +189,7 @@ DEPENDENCIES
189189
jquery-rails
190190
launchy
191191
quiet_assets
192-
rails (= 4.1.1)
192+
rails (= 4.1.4)
193193
rails_layout
194194
rspec-rails
195195
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)