Skip to content

Commit 51ed2f5

Browse files
jrgiffordjrgifford
committed
Revert "update rails due to the two CVEs"
This reverts commit 72af831.
1 parent fd37393 commit 51ed2f5

2 files changed

Lines changed: 133 additions & 134 deletions

File tree

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'http://rubygems.org'
22

3-
gem 'rails', '3.1.10'
3+
gem 'rails', '3.1.0'
44
gem 'json'
55

66
gem 'hackety_hack-lessons', '~> 1.1', :require => 'hackety_hack/lessons'

‎Gemfile.lock‎

Lines changed: 132 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -15,220 +15,219 @@ GIT
1515
GEM
1616
remote: http://rubygems.org/
1717
specs:
18-
actionmailer (3.1.10)
19-
actionpack (= 3.1.10)
20-
mail (~> 2.3.3)
21-
actionpack (3.1.10)
22-
activemodel (= 3.1.10)
23-
activesupport (= 3.1.10)
18+
actionmailer (3.1.0)
19+
actionpack (= 3.1.0)
20+
mail (~> 2.3.0)
21+
actionpack (3.1.0)
22+
activemodel (= 3.1.0)
23+
activesupport (= 3.1.0)
2424
builder (~> 3.0.0)
2525
erubis (~> 2.7.0)
2626
i18n (~> 0.6)
27-
rack (~> 1.3.6)
28-
rack-cache (~> 1.2)
27+
rack (~> 1.3.2)
28+
rack-cache (~> 1.0.3)
2929
rack-mount (~> 0.8.2)
3030
rack-test (~> 0.6.1)
31-
sprockets (~> 2.0.4)
32-
activemodel (3.1.10)
33-
activesupport (= 3.1.10)
31+
sprockets (~> 2.0.0)
32+
activemodel (3.1.0)
33+
activesupport (= 3.1.0)
34+
bcrypt-ruby (~> 3.0.0)
3435
builder (~> 3.0.0)
3536
i18n (~> 0.6)
36-
activerecord (3.1.10)
37-
activemodel (= 3.1.10)
38-
activesupport (= 3.1.10)
39-
arel (~> 2.2.3)
37+
activerecord (3.1.0)
38+
activemodel (= 3.1.0)
39+
activesupport (= 3.1.0)
40+
arel (~> 2.2.1)
4041
tzinfo (~> 0.3.29)
41-
activeresource (3.1.10)
42-
activemodel (= 3.1.10)
43-
activesupport (= 3.1.10)
44-
activesupport (3.1.10)
45-
multi_json (>= 1.0, < 1.3)
46-
addressable (2.3.2)
47-
arel (2.2.3)
42+
activeresource (3.1.0)
43+
activemodel (= 3.1.0)
44+
activesupport (= 3.1.0)
45+
activesupport (3.1.0)
46+
multi_json (~> 1.0)
47+
addressable (2.2.6)
48+
arel (2.2.1)
4849
bcrypt-ruby (3.0.1)
49-
bson (1.8.1)
50-
bson_ext (1.8.1)
51-
bson (~> 1.8.1)
52-
builder (3.0.4)
53-
cancan (1.6.8)
54-
capybara (2.0.2)
50+
bson (1.5.2)
51+
bson_ext (1.5.2)
52+
bson (= 1.5.2)
53+
builder (3.0.0)
54+
cancan (1.6.7)
55+
capybara (1.1.2)
5556
mime-types (>= 1.16)
5657
nokogiri (>= 1.3.3)
5758
rack (>= 1.0.0)
5859
rack-test (>= 0.5.4)
5960
selenium-webdriver (~> 2.0)
60-
xpath (~> 1.0.0)
61-
childprocess (0.3.6)
62-
ffi (~> 1.0, >= 1.0.6)
63-
coderay (1.0.8)
61+
xpath (~> 0.1.4)
62+
childprocess (0.3.0)
63+
ffi (~> 1.0.6)
64+
coderay (1.0.5)
6465
coffee-rails (3.1.1)
6566
coffee-script (>= 2.2.0)
6667
railties (~> 3.1.0)
6768
coffee-script (2.2.0)
6869
coffee-script-source
6970
execjs
70-
coffee-script-source (1.4.0)
71-
cucumber (1.2.1)
71+
coffee-script-source (1.2.0)
72+
cucumber (1.1.4)
7273
builder (>= 2.1.2)
73-
diff-lcs (>= 1.1.3)
74-
gherkin (~> 2.11.0)
74+
diff-lcs (>= 1.1.2)
75+
gherkin (~> 2.7.1)
7576
json (>= 1.4.6)
76-
cucumber-rails (1.3.0)
77+
term-ansicolor (>= 1.0.6)
78+
cucumber-rails (1.2.1)
7779
capybara (>= 1.1.2)
78-
cucumber (>= 1.1.8)
80+
cucumber (>= 1.1.3)
7981
nokogiri (>= 1.5.0)
80-
database_cleaner (0.9.1)
81-
devise (2.2.0)
82+
database_cleaner (0.7.1)
83+
devise (1.5.3)
8284
bcrypt-ruby (~> 3.0)
83-
orm_adapter (~> 0.1)
84-
railties (~> 3.1)
85-
warden (~> 1.2.1)
85+
orm_adapter (~> 0.0.3)
86+
warden (~> 1.1)
8687
diff-lcs (1.1.3)
8788
erubis (2.7.0)
88-
execjs (1.4.0)
89+
execjs (1.3.0)
8990
multi_json (~> 1.0)
90-
fabrication (2.5.4)
91-
faker (1.1.2)
92-
i18n (~> 0.5)
93-
ffi (1.3.1)
94-
gherkin (2.11.5)
91+
fabrication (1.2.0)
92+
faker (1.0.1)
93+
i18n (~> 0.4)
94+
ffi (1.0.11)
95+
gherkin (2.7.6)
9596
json (>= 1.4.6)
9697
hackety_hack-lessons (1.1.2)
9798
metadown
98-
haml (3.1.7)
99-
haml-rails (0.3.5)
100-
actionpack (>= 3.1, < 4.1)
101-
activesupport (>= 3.1, < 4.1)
102-
haml (~> 3.1)
103-
railties (>= 3.1, < 4.1)
99+
haml (3.1.4)
100+
haml-rails (0.3.4)
101+
actionpack (~> 3.0)
102+
activesupport (~> 3.0)
103+
haml (~> 3.0)
104+
railties (~> 3.0)
104105
has_scope (0.5.1)
105106
hike (1.2.1)
106-
i18n (0.6.1)
107-
inherited_resources (1.3.1)
107+
i18n (0.6.0)
108+
inherited_resources (1.3.0)
108109
has_scope (~> 0.5.0)
109-
responders (~> 0.6)
110+
responders (~> 0.6.0)
110111
jnunemaker-validatable (1.8.4)
111112
activesupport (>= 2.3.4)
112-
jquery-rails (2.1.4)
113-
railties (>= 3.0, < 5.0)
114-
thor (>= 0.14, < 2.0)
115-
json (1.7.6)
116-
kgio (2.7.4)
117-
launchy (2.1.2)
118-
addressable (~> 2.3)
119-
libwebsocket (0.1.7.1)
120-
addressable
121-
websocket
122-
mail (2.3.3)
113+
jquery-rails (1.0.19)
114+
railties (~> 3.0)
115+
thor (~> 0.14)
116+
json (1.6.5)
117+
kgio (2.7.2)
118+
launchy (2.0.5)
119+
addressable (~> 2.2.6)
120+
mail (2.3.0)
123121
i18n (>= 0.4.0)
124122
mime-types (~> 1.16)
125123
treetop (~> 1.4.8)
126124
metaclass (0.0.1)
127125
metadown (1.0.1)
128126
redcarpet
129-
method_source (0.8.1)
130-
mime-types (1.19)
131-
mm-devise (2.0)
127+
method_source (0.7.0)
128+
mime-types (1.17.2)
129+
mm-devise (1.3)
132130
devise (>= 1.2)
133131
mongo_mapper (>= 0.9.0)
134-
mocha (0.13.1)
132+
mocha (0.10.3)
135133
metaclass (~> 0.0.1)
136-
mongo (1.8.1)
137-
bson (~> 1.8.1)
138-
mongo_mapper (0.12.0)
134+
mongo (1.5.2)
135+
bson (= 1.5.2)
136+
mongo_mapper (0.10.1)
139137
activemodel (~> 3.0)
140138
activesupport (~> 3.0)
141-
plucky (~> 0.5.2)
142-
multi_json (1.2.0)
143-
nokogiri (1.5.6)
144-
orm_adapter (0.4.0)
145-
pg (0.14.1)
146-
plucky (0.5.2)
139+
plucky (~> 0.4.0)
140+
multi_json (1.0.4)
141+
nokogiri (1.5.0)
142+
orm_adapter (0.0.6)
143+
pg (0.12.2)
144+
plucky (0.4.4)
147145
mongo (~> 1.5)
148146
polyglot (0.3.3)
149-
pry (0.9.10)
147+
pry (0.9.8)
150148
coderay (~> 1.0.5)
151-
method_source (~> 0.8)
152-
slop (~> 3.3.1)
153-
rack (1.3.8)
154-
rack-cache (1.2)
149+
method_source (~> 0.7)
150+
slop (>= 2.4.3, < 3)
151+
rack (1.3.6)
152+
rack-cache (1.0.3)
155153
rack (>= 0.4)
156154
rack-mount (0.8.3)
157155
rack (>= 1.0.0)
158156
rack-ssl (1.3.2)
159157
rack
160-
rack-test (0.6.2)
158+
rack-test (0.6.1)
161159
rack (>= 1.0)
162-
rails (3.1.10)
163-
actionmailer (= 3.1.10)
164-
actionpack (= 3.1.10)
165-
activerecord (= 3.1.10)
166-
activeresource (= 3.1.10)
167-
activesupport (= 3.1.10)
160+
rails (3.1.0)
161+
actionmailer (= 3.1.0)
162+
actionpack (= 3.1.0)
163+
activerecord (= 3.1.0)
164+
activeresource (= 3.1.0)
165+
activesupport (= 3.1.0)
168166
bundler (~> 1.0)
169-
railties (= 3.1.10)
170-
railties (3.1.10)
171-
actionpack (= 3.1.10)
172-
activesupport (= 3.1.10)
167+
railties (= 3.1.0)
168+
railties (3.1.0)
169+
actionpack (= 3.1.0)
170+
activesupport (= 3.1.0)
173171
rack-ssl (~> 1.3.2)
174172
rake (>= 0.8.7)
175173
rdoc (~> 3.4)
176174
thor (~> 0.14.6)
177-
raindrops (0.10.0)
178-
rake (10.0.3)
175+
raindrops (0.8.0)
176+
rake (0.9.2.2)
179177
rdiscount (1.6.8)
180178
rdoc (3.12)
181179
json (~> 1.4)
182-
redcarpet (2.2.2)
183-
responders (0.9.3)
184-
railties (~> 3.1)
185-
rspec-core (2.12.2)
186-
rspec-expectations (2.12.1)
187-
diff-lcs (~> 1.1.3)
188-
rspec-mocks (2.12.1)
189-
rspec-rails (2.12.1)
180+
redcarpet (2.1.0)
181+
responders (0.6.5)
182+
rspec (2.8.0)
183+
rspec-core (~> 2.8.0)
184+
rspec-expectations (~> 2.8.0)
185+
rspec-mocks (~> 2.8.0)
186+
rspec-core (2.8.0)
187+
rspec-expectations (2.8.0)
188+
diff-lcs (~> 1.1.2)
189+
rspec-mocks (2.8.0)
190+
rspec-rails (2.8.1)
190191
actionpack (>= 3.0)
191192
activesupport (>= 3.0)
192193
railties (>= 3.0)
193-
rspec-core (~> 2.12.0)
194-
rspec-expectations (~> 2.12.0)
195-
rspec-mocks (~> 2.12.0)
196-
rubyzip (0.9.9)
197-
sass (3.2.5)
198-
sass-rails (3.1.6)
194+
rspec (~> 2.8.0)
195+
rubyzip (0.9.5)
196+
sass (3.1.12)
197+
sass-rails (3.1.5)
199198
actionpack (~> 3.1.0)
200199
railties (~> 3.1.0)
201-
sass (>= 3.1.10)
200+
sass (~> 3.1.10)
202201
tilt (~> 1.3.2)
203-
selenium-webdriver (2.27.2)
202+
selenium-webdriver (2.17.0)
204203
childprocess (>= 0.2.5)
205-
libwebsocket (~> 0.1.3)
206-
multi_json (~> 1.0)
204+
ffi (~> 1.0.9)
205+
multi_json (~> 1.0.4)
207206
rubyzip
208-
slop (3.3.3)
209-
sprockets (2.0.4)
207+
slop (2.4.3)
208+
sprockets (2.0.3)
210209
hike (~> 1.2)
211210
rack (~> 1.0)
212211
tilt (~> 1.1, != 1.3.0)
213-
sqlite3 (1.3.6)
212+
sqlite3 (1.3.5)
213+
term-ansicolor (1.0.7)
214214
thor (0.14.6)
215215
tilt (1.3.3)
216-
treetop (1.4.12)
216+
treetop (1.4.10)
217217
polyglot
218218
polyglot (>= 0.3.1)
219-
tzinfo (0.3.35)
220-
uglifier (1.3.0)
219+
tzinfo (0.3.31)
220+
uglifier (1.2.2)
221221
execjs (>= 0.3.0)
222-
multi_json (~> 1.0, >= 1.0.2)
223-
unicorn (4.5.0)
224-
kgio (~> 2.6)
222+
multi_json (>= 1.0.2)
223+
unicorn (4.1.1)
224+
kgio (~> 2.4)
225225
rack
226-
raindrops (~> 0.7)
227-
warden (1.2.1)
226+
raindrops (~> 0.6)
227+
warden (1.1.0)
228228
rack (>= 1.0)
229-
websocket (1.0.6)
230-
will_paginate (3.0.4)
231-
xpath (1.0.0)
229+
will_paginate (3.0.2)
230+
xpath (0.1.4)
232231
nokogiri (~> 1.3)
233232

234233
PLATFORMS
@@ -255,7 +254,7 @@ DEPENDENCIES
255254
mongo_mapper
256255
pg
257256
pry
258-
rails (= 3.1.10)
257+
rails (= 3.1.0)
259258
rdiscount
260259
rspec-rails
261260
sass-rails (~> 3.1.0)

0 commit comments

Comments
 (0)