Skip to content
This repository was archived by the owner on Mar 9, 2020. It is now read-only.

Commit 4bfbab5

Browse files
committed
Update dependencies
This fixes CVE-2014-3514 from rail 4.1.4.
1 parent 13fae9a commit 4bfbab5

File tree

2 files changed

+76
-77
lines changed

2 files changed

+76
-77
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
22

33

44
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
5-
gem 'rails', '4.1.4'
5+
gem 'rails', '~> 4.1'
66
# Use sqlite3 as the database for Active Record
77
gem 'sqlite3'
88
# Use SCSS for stylesheets

Gemfile.lock

Lines changed: 75 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,41 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.1.4)
5-
actionpack (= 4.1.4)
6-
actionview (= 4.1.4)
7-
mail (~> 2.5.4)
8-
actionpack (4.1.4)
9-
actionview (= 4.1.4)
10-
activesupport (= 4.1.4)
4+
actionmailer (4.1.6)
5+
actionpack (= 4.1.6)
6+
actionview (= 4.1.6)
7+
mail (~> 2.5, >= 2.5.4)
8+
actionpack (4.1.6)
9+
actionview (= 4.1.6)
10+
activesupport (= 4.1.6)
1111
rack (~> 1.5.2)
1212
rack-test (~> 0.6.2)
13-
actionview (4.1.4)
14-
activesupport (= 4.1.4)
13+
actionview (4.1.6)
14+
activesupport (= 4.1.6)
1515
builder (~> 3.1)
1616
erubis (~> 2.7.0)
17-
activemodel (4.1.4)
18-
activesupport (= 4.1.4)
17+
activemodel (4.1.6)
18+
activesupport (= 4.1.6)
1919
builder (~> 3.1)
20-
activerecord (4.1.4)
21-
activemodel (= 4.1.4)
22-
activesupport (= 4.1.4)
20+
activerecord (4.1.6)
21+
activemodel (= 4.1.6)
22+
activesupport (= 4.1.6)
2323
arel (~> 5.0.0)
24-
activesupport (4.1.4)
24+
activesupport (4.1.6)
2525
i18n (~> 0.6, >= 0.6.9)
2626
json (~> 1.7, >= 1.7.7)
2727
minitest (~> 5.1)
2828
thread_safe (~> 0.1)
2929
tzinfo (~> 1.1)
3030
arel (5.0.1.20140414130214)
3131
ast (2.0.0)
32+
astrolabe (1.3.0)
33+
parser (>= 2.2.0.pre.3, < 3.0)
3234
bcrypt (3.1.7)
3335
builder (3.2.2)
34-
celluloid (0.15.2)
35-
timers (~> 1.1.0)
36-
codeclimate-test-reporter (0.4.0)
36+
celluloid (0.16.0)
37+
timers (~> 4.0.0)
38+
codeclimate-test-reporter (0.4.1)
3739
simplecov (>= 0.7.1, < 1.0.0)
3840
coderay (1.1.0)
3941
coffee-rails (4.0.1)
@@ -42,15 +44,15 @@ GEM
4244
coffee-script (2.3.0)
4345
coffee-script-source
4446
execjs
45-
coffee-script-source (1.7.1)
47+
coffee-script-source (1.8.0)
4648
commonjs (0.2.7)
4749
diff-lcs (1.2.5)
4850
docile (1.1.5)
4951
erubis (2.7.0)
5052
execjs (2.2.1)
5153
faraday (0.9.0)
5254
multipart-post (>= 1.2, < 3)
53-
ffi (1.9.3)
55+
ffi (1.9.5)
5456
formatador (0.2.5)
5557
guard (2.6.1)
5658
formatador (>= 0.2.4)
@@ -62,11 +64,12 @@ GEM
6264
guard (~> 2.1)
6365
rspec (>= 2.14, < 4.0)
6466
hike (1.2.3)
67+
hitimes (1.2.2)
6568
i18n (0.6.11)
6669
jbuilder (2.1.3)
6770
activesupport (>= 3.0.0, < 5)
6871
multi_json (~> 1.2)
69-
jquery-rails (3.1.1)
72+
jquery-rails (3.1.2)
7073
railties (>= 3.0, < 5.0)
7174
thor (>= 0.14, < 2.0)
7275
jquery-ui-rails (5.0.0)
@@ -78,18 +81,17 @@ GEM
7881
less-rails (2.5.0)
7982
actionpack (>= 3.1)
8083
less (~> 2.5.0)
81-
libv8 (3.16.14.3)
82-
listen (2.7.9)
84+
libv8 (3.16.14.7)
85+
listen (2.7.11)
8386
celluloid (>= 0.15.2)
8487
rb-fsevent (>= 0.9.3)
8588
rb-inotify (>= 0.9)
8689
lumberjack (1.0.9)
87-
mail (2.5.4)
88-
mime-types (~> 1.16)
89-
treetop (~> 1.4.8)
90+
mail (2.6.1)
91+
mime-types (>= 1.16, < 3)
9092
method_source (0.8.2)
91-
mime-types (1.25.1)
92-
minitest (5.4.0)
93+
mime-types (2.3)
94+
minitest (5.4.2)
9395
multi_json (1.10.1)
9496
multi_xml (0.5.5)
9597
multipart-post (2.0.0)
@@ -103,28 +105,27 @@ GEM
103105
parser (2.2.0.pre.4)
104106
ast (>= 1.1, < 3.0)
105107
slop (~> 3.4, >= 3.4.5)
106-
polyglot (0.3.5)
107108
powerpack (0.0.9)
108-
pry (0.10.0)
109+
pry (0.10.1)
109110
coderay (~> 1.1.0)
110111
method_source (~> 0.8.1)
111112
slop (~> 3.4)
112113
rack (1.5.2)
113114
rack-test (0.6.2)
114115
rack (>= 1.0)
115-
rails (4.1.4)
116-
actionmailer (= 4.1.4)
117-
actionpack (= 4.1.4)
118-
actionview (= 4.1.4)
119-
activemodel (= 4.1.4)
120-
activerecord (= 4.1.4)
121-
activesupport (= 4.1.4)
116+
rails (4.1.6)
117+
actionmailer (= 4.1.6)
118+
actionpack (= 4.1.6)
119+
actionview (= 4.1.6)
120+
activemodel (= 4.1.6)
121+
activerecord (= 4.1.6)
122+
activesupport (= 4.1.6)
122123
bundler (>= 1.3.0, < 2.0)
123-
railties (= 4.1.4)
124+
railties (= 4.1.6)
124125
sprockets-rails (~> 2.0)
125-
railties (4.1.4)
126-
actionpack (= 4.1.4)
127-
activesupport (= 4.1.4)
126+
railties (4.1.6)
127+
actionpack (= 4.1.6)
128+
activesupport (= 4.1.6)
128129
rake (>= 0.8.7)
129130
thor (>= 0.18.1, < 2.0)
130131
rainbow (2.0.0)
@@ -133,36 +134,36 @@ GEM
133134
rb-inotify (0.9.5)
134135
ffi (>= 0.5.0)
135136
rb-readline (0.5.1)
136-
rdoc (4.1.1)
137+
rdoc (4.1.2)
137138
json (~> 1.4)
138139
ref (1.0.5)
139-
rspec (3.0.0)
140-
rspec-core (~> 3.0.0)
141-
rspec-expectations (~> 3.0.0)
142-
rspec-mocks (~> 3.0.0)
143-
rspec-core (3.0.3)
144-
rspec-support (~> 3.0.0)
145-
rspec-expectations (3.0.3)
140+
rspec (3.1.0)
141+
rspec-core (~> 3.1.0)
142+
rspec-expectations (~> 3.1.0)
143+
rspec-mocks (~> 3.1.0)
144+
rspec-core (3.1.4)
145+
rspec-support (~> 3.1.0)
146+
rspec-expectations (3.1.2)
146147
diff-lcs (>= 1.2.0, < 2.0)
147-
rspec-support (~> 3.0.0)
148-
rspec-mocks (3.0.3)
149-
rspec-support (~> 3.0.0)
150-
rspec-rails (3.0.2)
148+
rspec-support (~> 3.1.0)
149+
rspec-mocks (3.1.2)
150+
rspec-support (~> 3.1.0)
151+
rspec-rails (3.1.0)
151152
actionpack (>= 3.0)
152153
activesupport (>= 3.0)
153154
railties (>= 3.0)
154-
rspec-core (~> 3.0.0)
155-
rspec-expectations (~> 3.0.0)
156-
rspec-mocks (~> 3.0.0)
157-
rspec-support (~> 3.0.0)
158-
rspec-support (3.0.3)
159-
rubocop (0.24.1)
160-
json (>= 1.7.7, < 2)
161-
parser (>= 2.2.0.pre.3, < 3.0)
155+
rspec-core (~> 3.1.0)
156+
rspec-expectations (~> 3.1.0)
157+
rspec-mocks (~> 3.1.0)
158+
rspec-support (~> 3.1.0)
159+
rspec-support (3.1.1)
160+
rubocop (0.26.1)
161+
astrolabe (~> 1.3)
162+
parser (>= 2.2.0.pre.4, < 3.0)
162163
powerpack (~> 0.0.6)
163164
rainbow (>= 1.99.1, < 3.0)
164165
ruby-progressbar (~> 1.4)
165-
ruby-progressbar (1.5.1)
166+
ruby-progressbar (1.6.0)
166167
sass (3.2.19)
167168
sass-rails (4.0.3)
168169
railties (>= 4.0.0, < 5.0)
@@ -171,12 +172,12 @@ GEM
171172
sprockets-rails (~> 2.0)
172173
scoped_search (2.7.1)
173174
activerecord (>= 2.1.0)
174-
sdoc (0.4.0)
175-
json (~> 1.8)
176-
rdoc (~> 4.0, < 5.0)
177-
simplecov (0.9.0)
175+
sdoc (0.4.1)
176+
json (~> 1.7, >= 1.7.7)
177+
rdoc (~> 4.0)
178+
simplecov (0.9.1)
178179
docile (~> 1.1.0)
179-
multi_json
180+
multi_json (~> 1.0)
180181
simplecov-html (~> 0.8.0)
181182
simplecov-html (0.8.0)
182183
slop (3.6.0)
@@ -190,7 +191,7 @@ GEM
190191
multi_json (~> 1.0)
191192
rack (~> 1.0)
192193
tilt (~> 1.1, != 1.3.0)
193-
sprockets-rails (2.1.3)
194+
sprockets-rails (2.1.4)
194195
actionpack (>= 3.0)
195196
activesupport (>= 3.0)
196197
sprockets (~> 2.8)
@@ -201,20 +202,18 @@ GEM
201202
thor (0.19.1)
202203
thread_safe (0.3.4)
203204
tilt (1.4.1)
204-
timers (1.1.0)
205-
treetop (1.4.15)
206-
polyglot
207-
polyglot (>= 0.3.1)
208-
turbolinks (2.2.2)
205+
timers (4.0.1)
206+
hitimes
207+
turbolinks (2.3.0)
209208
coffee-rails
210209
twitter-bootstrap-rails (3.2.0)
211210
actionpack (~> 4.1)
212211
execjs (~> 2.2)
213212
rails (~> 4.1)
214213
railties (~> 4.1)
215-
tzinfo (1.2.1)
214+
tzinfo (1.2.2)
216215
thread_safe (~> 0.1)
217-
tzinfo-data (1.2014.6)
216+
tzinfo-data (1.2014.8)
218217
tzinfo (>= 1.0.0)
219218
uglifier (2.5.3)
220219
execjs (>= 0.3.0)
@@ -231,7 +230,7 @@ DEPENDENCIES
231230
jquery-rails
232231
jquery-ui-rails
233232
less-rails
234-
rails (= 4.1.4)
233+
rails (~> 4.1)
235234
rake
236235
rb-readline
237236
rspec-rails

0 commit comments

Comments
 (0)