Skip to content

Commit 7156067

Browse files
committed
upgrade to rails 4.0.13
1 parent af9c2d1 commit 7156067

2 files changed

Lines changed: 44 additions & 40 deletions

File tree

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

3-
gem 'rails', '4.0.12'
3+
gem 'rails', '4.0.13'
44

55
gem 'coffee-rails'
66
gem 'decent_exposure'

Gemfile.lock

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.0.12)
5-
actionpack (= 4.0.12)
4+
actionmailer (4.0.13)
5+
actionpack (= 4.0.13)
66
mail (~> 2.5, >= 2.5.4)
7-
actionpack (4.0.12)
8-
activesupport (= 4.0.12)
7+
actionpack (4.0.13)
8+
activesupport (= 4.0.13)
99
builder (~> 3.1.0)
1010
erubis (~> 2.7.0)
1111
rack (~> 1.5.2)
1212
rack-test (~> 0.6.2)
13-
activemodel (4.0.12)
14-
activesupport (= 4.0.12)
13+
activemodel (4.0.13)
14+
activesupport (= 4.0.13)
1515
builder (~> 3.1.0)
16-
activerecord (4.0.12)
17-
activemodel (= 4.0.12)
16+
activerecord (4.0.13)
17+
activemodel (= 4.0.13)
1818
activerecord-deprecated_finders (~> 1.0.2)
19-
activesupport (= 4.0.12)
19+
activesupport (= 4.0.13)
2020
arel (~> 4.0.0)
2121
activerecord-deprecated_finders (1.0.3)
22-
activesupport (4.0.12)
22+
activesupport (4.0.13)
2323
i18n (~> 0.6, >= 0.6.9)
2424
minitest (~> 4.2)
2525
multi_json (~> 1.3)
2626
thread_safe (~> 0.1)
2727
tzinfo (~> 0.3.37)
2828
arel (4.0.2)
29-
better_errors (2.1.0)
29+
better_errors (2.1.1)
3030
coderay (>= 1.0.0)
3131
erubis (>= 2.6.6)
3232
rack (>= 0.9.0)
@@ -48,37 +48,41 @@ GEM
4848
dotenv (= 1.0.2)
4949
erubis (2.7.0)
5050
execjs (2.2.2)
51-
haml (4.1.0.beta.1)
51+
haml (4.0.6)
5252
tilt
53-
haml-rails (0.6.0)
53+
haml-rails (0.7.0)
5454
actionpack (>= 4.0.1)
5555
activesupport (>= 4.0.1)
5656
haml (>= 3.1, < 5.0)
5757
html2haml (>= 1.0.1)
5858
railties (>= 4.0.1)
5959
hike (1.2.3)
60-
hpricot (0.8.6)
61-
html2haml (1.0.1)
60+
html2haml (2.0.0)
6261
erubis (~> 2.7.0)
63-
haml (>= 4.0.0.rc.1)
64-
hpricot (~> 0.8.6)
65-
ruby_parser (~> 3.1.1)
62+
haml (~> 4.0.0)
63+
nokogiri (~> 1.6.0)
64+
ruby_parser (~> 3.5)
6665
i18n (0.7.0)
6766
jbuilder (2.2.6)
6867
activesupport (>= 3.0.0, < 5)
6968
multi_json (~> 1.2)
7069
jquery-rails (3.1.2)
7170
railties (>= 3.0, < 5.0)
7271
thor (>= 0.14, < 2.0)
73-
json (1.8.1)
72+
json (1.8.2)
7473
mail (2.6.3)
7574
mime-types (>= 1.16, < 3)
7675
method_source (0.8.2)
7776
mime-types (2.4.3)
77+
mini_portile (0.6.2)
7878
minitest (4.7.5)
7979
multi_json (1.10.1)
80-
pg (0.17.1)
81-
pg (0.17.1-x86-mingw32)
80+
nokogiri (1.6.6.2)
81+
mini_portile (~> 0.6.0)
82+
nokogiri (1.6.6.2-x86-mingw32)
83+
mini_portile (~> 0.6.0)
84+
pg (0.18.1)
85+
pg (0.18.1-x86-mingw32)
8286
pry (0.10.1)
8387
coderay (~> 1.1.0)
8488
method_source (~> 0.8.1)
@@ -90,59 +94,59 @@ GEM
9094
win32console (~> 1.3)
9195
pry-rails (0.3.2)
9296
pry (>= 0.9.10)
93-
puma (2.10.2)
97+
puma (2.11.0)
9498
rack (>= 1.1, < 2.0)
9599
quiet_assets (1.1.0)
96100
railties (>= 3.1, < 5.0)
97101
rack (1.5.2)
98-
rack-test (0.6.2)
102+
rack-test (0.6.3)
99103
rack (>= 1.0)
100-
rails (4.0.12)
101-
actionmailer (= 4.0.12)
102-
actionpack (= 4.0.12)
103-
activerecord (= 4.0.12)
104-
activesupport (= 4.0.12)
104+
rails (4.0.13)
105+
actionmailer (= 4.0.13)
106+
actionpack (= 4.0.13)
107+
activerecord (= 4.0.13)
108+
activesupport (= 4.0.13)
105109
bundler (>= 1.3.0, < 2.0)
106-
railties (= 4.0.12)
110+
railties (= 4.0.13)
107111
sprockets-rails (~> 2.0)
108112
rails_12factor (0.0.3)
109113
rails_serve_static_assets
110114
rails_stdout_logging
111115
rails_serve_static_assets (0.0.3)
112116
rails_stdout_logging (0.0.3)
113-
railties (4.0.12)
114-
actionpack (= 4.0.12)
115-
activesupport (= 4.0.12)
117+
railties (4.0.13)
118+
actionpack (= 4.0.13)
119+
activesupport (= 4.0.13)
116120
rake (>= 0.8.7)
117121
thor (>= 0.18.1, < 2.0)
118122
rake (10.4.2)
119123
redcarpet (3.2.2)
120124
rouge (1.7.7)
121-
ruby_parser (3.1.3)
125+
ruby_parser (3.6.4)
122126
sexp_processor (~> 4.1)
123-
sass (3.4.9)
124-
sass-rails (5.0.0)
127+
sass (3.4.10)
128+
sass-rails (5.0.1)
125129
railties (>= 4.0.0, < 5.0)
126130
sass (~> 3.1)
127131
sprockets (>= 2.8, < 4.0)
128132
sprockets-rails (>= 2.0, < 4.0)
129133
tilt (~> 1.1)
130-
sexp_processor (4.4.4)
134+
sexp_processor (4.4.5)
131135
slop (3.6.0)
132136
sprockets (2.12.3)
133137
hike (~> 1.2)
134138
multi_json (~> 1.0)
135139
rack (~> 1.0)
136140
tilt (~> 1.1, != 1.3.0)
137-
sprockets-rails (2.2.2)
141+
sprockets-rails (2.2.4)
138142
actionpack (>= 3.0)
139143
activesupport (>= 3.0)
140144
sprockets (>= 2.8, < 4.0)
141145
thor (0.19.1)
142146
thread_safe (0.3.4)
143147
tilt (1.4.1)
144148
tzinfo (0.3.42)
145-
uglifier (2.6.0)
149+
uglifier (2.7.0)
146150
execjs (>= 0.3.0)
147151
json (>= 1.8.0)
148152
win32console (1.3.2-x86-mingw32)
@@ -164,7 +168,7 @@ DEPENDENCIES
164168
pry-rails
165169
puma
166170
quiet_assets
167-
rails (= 4.0.12)
171+
rails (= 4.0.13)
168172
rails_12factor
169173
redcarpet
170174
rouge

0 commit comments

Comments
 (0)