Skip to content

Commit f330677

Browse files
committed
Updating all dependencies
1 parent f782d0e commit f330677

1 file changed

Lines changed: 57 additions & 58 deletions

File tree

Gemfile.lock

Lines changed: 57 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,19 @@ GEM
4646
multi_json (~> 1.0)
4747
arel (2.2.1)
4848
bcrypt-ruby (3.0.1)
49-
bson (1.3.1)
50-
bson_ext (1.3.1)
49+
bson (1.5.2)
50+
bson_ext (1.5.2)
51+
bson (= 1.5.2)
5152
builder (3.0.0)
5253
cancan (1.6.7)
53-
capybara (1.1.1)
54+
capybara (1.1.2)
5455
mime-types (>= 1.16)
5556
nokogiri (>= 1.3.3)
5657
rack (>= 1.0.0)
5758
rack-test (>= 0.5.4)
5859
selenium-webdriver (~> 2.0)
5960
xpath (~> 0.1.4)
60-
childprocess (0.2.2)
61+
childprocess (0.2.6)
6162
ffi (~> 1.0.6)
6263
coderay (0.9.8)
6364
coffee-rails (3.1.1)
@@ -66,33 +67,33 @@ GEM
6667
coffee-script (2.2.0)
6768
coffee-script-source
6869
execjs
69-
coffee-script-source (1.1.2)
70-
cucumber (1.1.1)
70+
coffee-script-source (1.2.0)
71+
cucumber (1.1.4)
7172
builder (>= 2.1.2)
7273
diff-lcs (>= 1.1.2)
73-
gherkin (~> 2.6.0)
74+
gherkin (~> 2.7.1)
7475
json (>= 1.4.6)
7576
term-ansicolor (>= 1.0.6)
76-
cucumber-rails (1.1.1)
77-
capybara (>= 1.1.1)
78-
cucumber (>= 1.1.0)
77+
cucumber-rails (1.2.1)
78+
capybara (>= 1.1.2)
79+
cucumber (>= 1.1.3)
7980
nokogiri (>= 1.5.0)
80-
database_cleaner (0.6.7)
81-
devise (1.4.9)
81+
database_cleaner (0.7.0)
82+
devise (1.5.3)
8283
bcrypt-ruby (~> 3.0)
8384
orm_adapter (~> 0.0.3)
84-
warden (~> 1.0.3)
85+
warden (~> 1.1)
8586
diff-lcs (1.1.3)
8687
erubis (2.7.0)
87-
execjs (1.2.9)
88+
execjs (1.2.13)
8889
multi_json (~> 1.0)
8990
fabrication (1.2.0)
9091
faker (1.0.1)
9192
i18n (~> 0.4)
92-
ffi (1.0.9)
93-
gherkin (2.6.1)
93+
ffi (1.0.11)
94+
gherkin (2.7.2)
9495
json (>= 1.4.6)
95-
haml (3.1.3)
96+
haml (3.1.4)
9697
haml-rails (0.3.4)
9798
actionpack (~> 3.0)
9899
activesupport (~> 3.0)
@@ -106,12 +107,11 @@ GEM
106107
responders (~> 0.6.0)
107108
jnunemaker-validatable (1.8.4)
108109
activesupport (>= 2.3.4)
109-
jquery-rails (1.0.16)
110+
jquery-rails (1.0.19)
110111
railties (~> 3.0)
111112
thor (~> 0.14)
112-
json (1.6.1)
113-
json_pure (1.6.1)
114-
kgio (2.6.0)
113+
json (1.6.4)
114+
kgio (2.7.2)
115115
mail (2.3.0)
116116
i18n (>= 0.4.0)
117117
mime-types (~> 1.16)
@@ -125,25 +125,25 @@ GEM
125125
mongo_mapper (>= 0.9.0)
126126
mocha (0.10.0)
127127
metaclass (~> 0.0.1)
128-
mongo (1.3.1)
129-
bson (>= 1.3.1)
130-
mongo_mapper (0.9.2)
128+
mongo (1.5.2)
129+
bson (= 1.5.2)
130+
mongo_mapper (0.10.1)
131131
activemodel (~> 3.0)
132132
activesupport (~> 3.0)
133-
plucky (~> 0.3.8)
134-
multi_json (1.0.3)
133+
plucky (~> 0.4.0)
134+
multi_json (1.0.4)
135135
nokogiri (1.5.0)
136136
orm_adapter (0.0.5)
137-
pg (0.11.0)
138-
plucky (0.3.8)
137+
pg (0.12.2)
138+
plucky (0.4.3)
139139
mongo (~> 1.3)
140-
polyglot (0.3.2)
141-
pry (0.9.7.3)
140+
polyglot (0.3.3)
141+
pry (0.9.7.4)
142142
coderay (~> 0.9.8)
143143
method_source (~> 0.6.7)
144144
ruby_parser (>= 2.3.1)
145145
slop (~> 2.1.0)
146-
rack (1.3.5)
146+
rack (1.3.6)
147147
rack-cache (1.0.3)
148148
rack (>= 0.4)
149149
rack-mount (0.8.3)
@@ -170,59 +170,58 @@ GEM
170170
raindrops (0.8.0)
171171
rake (0.9.2.2)
172172
rdiscount (1.6.8)
173-
rdoc (3.11)
173+
rdoc (3.12)
174174
json (~> 1.4)
175175
responders (0.6.4)
176-
rspec (2.7.0)
177-
rspec-core (~> 2.7.0)
178-
rspec-expectations (~> 2.7.0)
179-
rspec-mocks (~> 2.7.0)
180-
rspec-core (2.7.1)
181-
rspec-expectations (2.7.0)
176+
rspec (2.8.0)
177+
rspec-core (~> 2.8.0)
178+
rspec-expectations (~> 2.8.0)
179+
rspec-mocks (~> 2.8.0)
180+
rspec-core (2.8.0)
181+
rspec-expectations (2.8.0)
182182
diff-lcs (~> 1.1.2)
183-
rspec-mocks (2.7.0)
184-
rspec-rails (2.7.0)
185-
actionpack (~> 3.0)
186-
activesupport (~> 3.0)
187-
railties (~> 3.0)
188-
rspec (~> 2.7.0)
183+
rspec-mocks (2.8.0)
184+
rspec-rails (2.8.1)
185+
actionpack (>= 3.0)
186+
activesupport (>= 3.0)
187+
railties (>= 3.0)
188+
rspec (~> 2.8.0)
189189
ruby_parser (2.3.1)
190190
sexp_processor (~> 3.0)
191-
rubyzip (0.9.4)
192-
sass (3.1.10)
193-
sass-rails (3.1.4)
191+
rubyzip (0.9.5)
192+
sass (3.1.12)
193+
sass-rails (3.1.5)
194194
actionpack (~> 3.1.0)
195195
railties (~> 3.1.0)
196-
sass (>= 3.1.4)
197-
sprockets (~> 2.0.0)
196+
sass (~> 3.1.10)
198197
tilt (~> 1.3.2)
199-
selenium-webdriver (2.10.0)
200-
childprocess (>= 0.2.1)
201-
ffi (= 1.0.9)
202-
json_pure
198+
selenium-webdriver (2.16.0)
199+
childprocess (>= 0.2.5)
200+
ffi (~> 1.0.9)
201+
multi_json (~> 1.0.4)
203202
rubyzip
204-
sexp_processor (3.0.7)
203+
sexp_processor (3.0.10)
205204
slop (2.1.0)
206205
sprockets (2.0.3)
207206
hike (~> 1.2)
208207
rack (~> 1.0)
209208
tilt (~> 1.1, != 1.3.0)
210-
sqlite3 (1.3.4)
209+
sqlite3 (1.3.5)
211210
term-ansicolor (1.0.7)
212211
thor (0.14.6)
213212
tilt (1.3.3)
214213
treetop (1.4.10)
215214
polyglot
216215
polyglot (>= 0.3.1)
217-
tzinfo (0.3.30)
218-
uglifier (1.0.4)
216+
tzinfo (0.3.31)
217+
uglifier (1.2.1)
219218
execjs (>= 0.3.0)
220219
multi_json (>= 1.0.2)
221220
unicorn (4.1.1)
222221
kgio (~> 2.4)
223222
rack
224223
raindrops (~> 0.6)
225-
warden (1.0.6)
224+
warden (1.1.0)
226225
rack (>= 1.0)
227226
will_paginate (3.0.2)
228227
xpath (0.1.4)

0 commit comments

Comments
 (0)