Commit 199e4a1dbfc64be321d9ea1dd7a56676bad445c7
1 parent
a4502c00
Exists in
staging
and in
1 other branch
updating Gemfile.lock file
Showing
1 changed file
with
73 additions
and
70 deletions
Show diff stats
Gemfile.lock
@@ -108,15 +108,15 @@ GEM | @@ -108,15 +108,15 @@ GEM | ||
108 | remote: https://rubygems.org/ | 108 | remote: https://rubygems.org/ |
109 | specs: | 109 | specs: |
110 | RedCloth (4.2.9) | 110 | RedCloth (4.2.9) |
111 | - actionmailer (4.2.5) | ||
112 | - actionpack (= 4.2.5) | ||
113 | - actionview (= 4.2.5) | ||
114 | - activejob (= 4.2.5) | 111 | + actionmailer (4.2.6) |
112 | + actionpack (= 4.2.6) | ||
113 | + actionview (= 4.2.6) | ||
114 | + activejob (= 4.2.6) | ||
115 | mail (~> 2.5, >= 2.5.4) | 115 | mail (~> 2.5, >= 2.5.4) |
116 | rails-dom-testing (~> 1.0, >= 1.0.5) | 116 | rails-dom-testing (~> 1.0, >= 1.0.5) |
117 | - actionpack (4.2.5) | ||
118 | - actionview (= 4.2.5) | ||
119 | - activesupport (= 4.2.5) | 117 | + actionpack (4.2.6) |
118 | + actionview (= 4.2.6) | ||
119 | + activesupport (= 4.2.6) | ||
120 | rack (~> 1.6) | 120 | rack (~> 1.6) |
121 | rack-test (~> 0.6.2) | 121 | rack-test (~> 0.6.2) |
122 | rails-dom-testing (~> 1.0, >= 1.0.5) | 122 | rails-dom-testing (~> 1.0, >= 1.0.5) |
@@ -125,27 +125,27 @@ GEM | @@ -125,27 +125,27 @@ GEM | ||
125 | actionpack (>= 4.0.0, < 5.0) | 125 | actionpack (>= 4.0.0, < 5.0) |
126 | actionpack-page_caching (1.0.2) | 126 | actionpack-page_caching (1.0.2) |
127 | actionpack (>= 4.0.0, < 5) | 127 | actionpack (>= 4.0.0, < 5) |
128 | - actionview (4.2.5) | ||
129 | - activesupport (= 4.2.5) | 128 | + actionview (4.2.6) |
129 | + activesupport (= 4.2.6) | ||
130 | builder (~> 3.1) | 130 | builder (~> 3.1) |
131 | erubis (~> 2.7.0) | 131 | erubis (~> 2.7.0) |
132 | rails-dom-testing (~> 1.0, >= 1.0.5) | 132 | rails-dom-testing (~> 1.0, >= 1.0.5) |
133 | rails-html-sanitizer (~> 1.0, >= 1.0.2) | 133 | rails-html-sanitizer (~> 1.0, >= 1.0.2) |
134 | - activejob (4.2.5) | ||
135 | - activesupport (= 4.2.5) | 134 | + activejob (4.2.6) |
135 | + activesupport (= 4.2.6) | ||
136 | globalid (>= 0.3.0) | 136 | globalid (>= 0.3.0) |
137 | - activemodel (4.2.5) | ||
138 | - activesupport (= 4.2.5) | 137 | + activemodel (4.2.6) |
138 | + activesupport (= 4.2.6) | ||
139 | builder (~> 3.1) | 139 | builder (~> 3.1) |
140 | - activerecord (4.2.5) | ||
141 | - activemodel (= 4.2.5) | ||
142 | - activesupport (= 4.2.5) | 140 | + activerecord (4.2.6) |
141 | + activemodel (= 4.2.6) | ||
142 | + activesupport (= 4.2.6) | ||
143 | arel (~> 6.0) | 143 | arel (~> 6.0) |
144 | activerecord-session_store (0.1.2) | 144 | activerecord-session_store (0.1.2) |
145 | actionpack (>= 4.0.0, < 5) | 145 | actionpack (>= 4.0.0, < 5) |
146 | activerecord (>= 4.0.0, < 5) | 146 | activerecord (>= 4.0.0, < 5) |
147 | railties (>= 4.0.0, < 5) | 147 | railties (>= 4.0.0, < 5) |
148 | - activesupport (4.2.5) | 148 | + activesupport (4.2.6) |
149 | i18n (~> 0.7) | 149 | i18n (~> 0.7) |
150 | json (~> 1.7, >= 1.7.7) | 150 | json (~> 1.7, >= 1.7.7) |
151 | minitest (~> 5.1) | 151 | minitest (~> 5.1) |
@@ -158,14 +158,15 @@ GEM | @@ -158,14 +158,15 @@ GEM | ||
158 | builder | 158 | builder |
159 | multi_json | 159 | multi_json |
160 | ansi (1.5.0) | 160 | ansi (1.5.0) |
161 | - api-pagination (4.1.1) | 161 | + api-pagination (4.3.0) |
162 | arel (6.0.3) | 162 | arel (6.0.3) |
163 | axiom-types (0.1.1) | 163 | axiom-types (0.1.1) |
164 | descendants_tracker (~> 0.0.4) | 164 | descendants_tracker (~> 0.0.4) |
165 | ice_nine (~> 0.11.0) | 165 | ice_nine (~> 0.11.0) |
166 | thread_safe (~> 0.3, >= 0.3.1) | 166 | thread_safe (~> 0.3, >= 0.3.1) |
167 | builder (3.2.2) | 167 | builder (3.2.2) |
168 | - capybara (2.5.0) | 168 | + capybara (2.6.2) |
169 | + addressable | ||
169 | mime-types (>= 1.16) | 170 | mime-types (>= 1.16) |
170 | nokogiri (>= 1.3.3) | 171 | nokogiri (>= 1.3.3) |
171 | rack (>= 1.0.0) | 172 | rack (>= 1.0.0) |
@@ -176,21 +177,26 @@ GEM | @@ -176,21 +177,26 @@ GEM | ||
176 | chronic (0.10.2) | 177 | chronic (0.10.2) |
177 | coercible (1.0.0) | 178 | coercible (1.0.0) |
178 | descendants_tracker (~> 0.0.1) | 179 | descendants_tracker (~> 0.0.1) |
179 | - concurrent-ruby (1.0.0) | ||
180 | - cucumber (1.3.20) | 180 | + concurrent-ruby (1.0.1) |
181 | + cucumber (2.3.3) | ||
181 | builder (>= 2.1.2) | 182 | builder (>= 2.1.2) |
183 | + cucumber-core (~> 1.4.0) | ||
184 | + cucumber-wire (~> 0.0.1) | ||
182 | diff-lcs (>= 1.1.3) | 185 | diff-lcs (>= 1.1.3) |
183 | - gherkin (~> 2.12) | 186 | + gherkin (~> 3.2.0) |
184 | multi_json (>= 1.7.5, < 2.0) | 187 | multi_json (>= 1.7.5, < 2.0) |
185 | multi_test (>= 0.1.2) | 188 | multi_test (>= 0.1.2) |
186 | - cucumber-rails (1.4.2) | 189 | + cucumber-core (1.4.0) |
190 | + gherkin (~> 3.2.0) | ||
191 | + cucumber-rails (1.4.3) | ||
187 | capybara (>= 1.1.2, < 3) | 192 | capybara (>= 1.1.2, < 3) |
188 | - cucumber (>= 1.3.8, < 2) | ||
189 | - mime-types (>= 1.16, < 3) | 193 | + cucumber (>= 1.3.8, < 3) |
194 | + mime-types (>= 1.16, < 4) | ||
190 | nokogiri (~> 1.5) | 195 | nokogiri (~> 1.5) |
191 | - rails (>= 3, < 5) | 196 | + railties (>= 3, < 5) |
197 | + cucumber-wire (0.0.1) | ||
192 | daemons (1.2.3) | 198 | daemons (1.2.3) |
193 | - dalli (2.7.5) | 199 | + dalli (2.7.6) |
194 | database_cleaner (1.5.1) | 200 | database_cleaner (1.5.1) |
195 | delayed_job (4.1.1) | 201 | delayed_job (4.1.1) |
196 | activesupport (>= 3.0, < 5.0) | 202 | activesupport (>= 3.0, < 5.0) |
@@ -201,9 +207,9 @@ GEM | @@ -201,9 +207,9 @@ GEM | ||
201 | thread_safe (~> 0.3, >= 0.3.1) | 207 | thread_safe (~> 0.3, >= 0.3.1) |
202 | diff-lcs (1.2.5) | 208 | diff-lcs (1.2.5) |
203 | diffy (3.1.0) | 209 | diffy (3.1.0) |
204 | - domain_name (0.5.25) | 210 | + domain_name (0.5.20160310) |
205 | unf (>= 0.0.5, < 1.0.0) | 211 | unf (>= 0.0.5, < 1.0.0) |
206 | - eita-jrails (0.10.0) | 212 | + eita-jrails (0.10.1) |
207 | actionpack (>= 3.1.0) | 213 | actionpack (>= 3.1.0) |
208 | activesupport (>= 3.0.0) | 214 | activesupport (>= 3.0.0) |
209 | equalizer (0.0.11) | 215 | equalizer (0.0.11) |
@@ -214,15 +220,14 @@ GEM | @@ -214,15 +220,14 @@ GEM | ||
214 | execjs (2.6.0) | 220 | execjs (2.6.0) |
215 | fast_gettext (0.9.2) | 221 | fast_gettext (0.9.2) |
216 | ffi (1.9.10) | 222 | ffi (1.9.10) |
217 | - gettext (3.1.9) | 223 | + gettext (3.2.1) |
218 | locale (>= 2.0.5) | 224 | locale (>= 2.0.5) |
219 | text (>= 1.3.0) | 225 | text (>= 1.3.0) |
220 | - gherkin (2.12.2) | ||
221 | - multi_json (~> 1.3) | 226 | + gherkin (3.2.0) |
222 | git-version-bump (0.15.1) | 227 | git-version-bump (0.15.1) |
223 | globalid (0.3.6) | 228 | globalid (0.3.6) |
224 | activesupport (>= 4.1.0) | 229 | activesupport (>= 4.1.0) |
225 | - grape (0.14.0) | 230 | + grape (0.15.0) |
226 | activesupport | 231 | activesupport |
227 | builder | 232 | builder |
228 | hashie (>= 2.1.0) | 233 | hashie (>= 2.1.0) |
@@ -238,13 +243,13 @@ GEM | @@ -238,13 +243,13 @@ GEM | ||
238 | grape-swagger (0.10.2) | 243 | grape-swagger (0.10.2) |
239 | grape (>= 0.8.0) | 244 | grape (>= 0.8.0) |
240 | grape-entity | 245 | grape-entity |
241 | - grape_logging (1.1.2) | 246 | + grape_logging (1.2.1) |
242 | grape | 247 | grape |
243 | hashie (3.4.3) | 248 | hashie (3.4.3) |
244 | http-cookie (1.0.2) | 249 | http-cookie (1.0.2) |
245 | domain_name (~> 0.5) | 250 | domain_name (~> 0.5) |
246 | i18n (0.7.0) | 251 | i18n (0.7.0) |
247 | - ice_nine (0.11.1) | 252 | + ice_nine (0.11.2) |
248 | json (1.8.3) | 253 | json (1.8.3) |
249 | kgio (2.10.0) | 254 | kgio (2.10.0) |
250 | kramdown (1.9.0) | 255 | kramdown (1.9.0) |
@@ -256,13 +261,13 @@ GEM | @@ -256,13 +261,13 @@ GEM | ||
256 | nokogiri (>= 1.5.9) | 261 | nokogiri (>= 1.5.9) |
257 | magic (0.2.9) | 262 | magic (0.2.9) |
258 | ffi (>= 0.6.3) | 263 | ffi (>= 0.6.3) |
259 | - mail (2.6.3) | ||
260 | - mime-types (>= 1.16, < 3) | 264 | + mail (2.6.4) |
265 | + mime-types (>= 1.16, < 4) | ||
261 | metaclass (0.0.4) | 266 | metaclass (0.0.4) |
262 | - mime-types (2.99) | 267 | + mime-types (2.99.1) |
263 | mini_portile2 (2.0.0) | 268 | mini_portile2 (2.0.0) |
264 | - minitest (5.8.3) | ||
265 | - minitest-reporters (1.1.7) | 269 | + minitest (5.8.4) |
270 | + minitest-reporters (1.1.8) | ||
266 | ansi | 271 | ansi |
267 | builder | 272 | builder |
268 | minitest (>= 5.0) | 273 | minitest (>= 5.0) |
@@ -273,11 +278,11 @@ GEM | @@ -273,11 +278,11 @@ GEM | ||
273 | multi_test (0.1.2) | 278 | multi_test (0.1.2) |
274 | multi_xml (0.5.5) | 279 | multi_xml (0.5.5) |
275 | netrc (0.11.0) | 280 | netrc (0.11.0) |
276 | - nokogiri (1.6.7.1) | 281 | + nokogiri (1.6.7.2) |
277 | mini_portile2 (~> 2.0.0.rc2) | 282 | mini_portile2 (~> 2.0.0.rc2) |
278 | pg (0.18.4) | 283 | pg (0.18.4) |
279 | pothoven-attachment_fu (3.2.16) | 284 | pothoven-attachment_fu (3.2.16) |
280 | - power_assert (0.2.6) | 285 | + power_assert (0.2.7) |
281 | protected_attributes (1.1.3) | 286 | protected_attributes (1.1.3) |
282 | activemodel (>= 4.0.1, < 5.0) | 287 | activemodel (>= 4.0.1, < 5.0) |
283 | rack (1.6.4) | 288 | rack (1.6.4) |
@@ -291,16 +296,16 @@ GEM | @@ -291,16 +296,16 @@ GEM | ||
291 | rack (>= 1.0.0) | 296 | rack (>= 1.0.0) |
292 | rack-test (0.6.3) | 297 | rack-test (0.6.3) |
293 | rack (>= 1.0) | 298 | rack (>= 1.0) |
294 | - rails (4.2.5) | ||
295 | - actionmailer (= 4.2.5) | ||
296 | - actionpack (= 4.2.5) | ||
297 | - actionview (= 4.2.5) | ||
298 | - activejob (= 4.2.5) | ||
299 | - activemodel (= 4.2.5) | ||
300 | - activerecord (= 4.2.5) | ||
301 | - activesupport (= 4.2.5) | 299 | + rails (4.2.6) |
300 | + actionmailer (= 4.2.6) | ||
301 | + actionpack (= 4.2.6) | ||
302 | + actionview (= 4.2.6) | ||
303 | + activejob (= 4.2.6) | ||
304 | + activemodel (= 4.2.6) | ||
305 | + activerecord (= 4.2.6) | ||
306 | + activesupport (= 4.2.6) | ||
302 | bundler (>= 1.3.0, < 2.0) | 307 | bundler (>= 1.3.0, < 2.0) |
303 | - railties (= 4.2.5) | 308 | + railties (= 4.2.6) |
304 | sprockets-rails | 309 | sprockets-rails |
305 | rails-deprecated_sanitizer (1.0.3) | 310 | rails-deprecated_sanitizer (1.0.3) |
306 | activesupport (>= 4.2.0.alpha) | 311 | activesupport (>= 4.2.0.alpha) |
@@ -308,19 +313,19 @@ GEM | @@ -308,19 +313,19 @@ GEM | ||
308 | activesupport (>= 4.2.0.beta, < 5.0) | 313 | activesupport (>= 4.2.0.beta, < 5.0) |
309 | nokogiri (~> 1.6.0) | 314 | nokogiri (~> 1.6.0) |
310 | rails-deprecated_sanitizer (>= 1.0.1) | 315 | rails-deprecated_sanitizer (>= 1.0.1) |
311 | - rails-html-sanitizer (1.0.2) | 316 | + rails-html-sanitizer (1.0.3) |
312 | loofah (~> 2.0) | 317 | loofah (~> 2.0) |
313 | rails-observers (0.1.2) | 318 | rails-observers (0.1.2) |
314 | activemodel (~> 4.0) | 319 | activemodel (~> 4.0) |
315 | rails_autolink (1.1.6) | 320 | rails_autolink (1.1.6) |
316 | rails (> 3.1) | 321 | rails (> 3.1) |
317 | - railties (4.2.5) | ||
318 | - actionpack (= 4.2.5) | ||
319 | - activesupport (= 4.2.5) | 322 | + railties (4.2.6) |
323 | + actionpack (= 4.2.6) | ||
324 | + activesupport (= 4.2.6) | ||
320 | rake (>= 0.8.7) | 325 | rake (>= 0.8.7) |
321 | thor (>= 0.18.1, < 2.0) | 326 | thor (>= 0.18.1, < 2.0) |
322 | - raindrops (0.15.0) | ||
323 | - rake (10.4.2) | 327 | + raindrops (0.16.0) |
328 | + rake (11.1.1) | ||
324 | rest-client (1.8.0) | 329 | rest-client (1.8.0) |
325 | http-cookie (>= 1.0.2, < 2.0) | 330 | http-cookie (>= 1.0.2, < 2.0) |
326 | mime-types (>= 1.16, < 3.0) | 331 | mime-types (>= 1.16, < 3.0) |
@@ -330,15 +335,15 @@ GEM | @@ -330,15 +335,15 @@ GEM | ||
330 | rspec-core (~> 3.4.0) | 335 | rspec-core (~> 3.4.0) |
331 | rspec-expectations (~> 3.4.0) | 336 | rspec-expectations (~> 3.4.0) |
332 | rspec-mocks (~> 3.4.0) | 337 | rspec-mocks (~> 3.4.0) |
333 | - rspec-core (3.4.1) | 338 | + rspec-core (3.4.4) |
334 | rspec-support (~> 3.4.0) | 339 | rspec-support (~> 3.4.0) |
335 | rspec-expectations (3.4.0) | 340 | rspec-expectations (3.4.0) |
336 | diff-lcs (>= 1.2.0, < 2.0) | 341 | diff-lcs (>= 1.2.0, < 2.0) |
337 | rspec-support (~> 3.4.0) | 342 | rspec-support (~> 3.4.0) |
338 | - rspec-mocks (3.4.0) | 343 | + rspec-mocks (3.4.1) |
339 | diff-lcs (>= 1.2.0, < 2.0) | 344 | diff-lcs (>= 1.2.0, < 2.0) |
340 | rspec-support (~> 3.4.0) | 345 | rspec-support (~> 3.4.0) |
341 | - rspec-rails (3.4.0) | 346 | + rspec-rails (3.4.2) |
342 | actionpack (>= 3.0, < 4.3) | 347 | actionpack (>= 3.0, < 4.3) |
343 | activesupport (>= 3.0, < 4.3) | 348 | activesupport (>= 3.0, < 4.3) |
344 | railties (>= 3.0, < 4.3) | 349 | railties (>= 3.0, < 4.3) |
@@ -351,22 +356,21 @@ GEM | @@ -351,22 +356,21 @@ GEM | ||
351 | magic | 356 | magic |
352 | ruby-progressbar (1.7.5) | 357 | ruby-progressbar (1.7.5) |
353 | rubyzip (1.2.0) | 358 | rubyzip (1.2.0) |
354 | - sass (3.4.20) | 359 | + sass (3.4.21) |
355 | sass-rails (5.0.4) | 360 | sass-rails (5.0.4) |
356 | railties (>= 4.0.0, < 5.0) | 361 | railties (>= 4.0.0, < 5.0) |
357 | sass (~> 3.1) | 362 | sass (~> 3.1) |
358 | sprockets (>= 2.8, < 4.0) | 363 | sprockets (>= 2.8, < 4.0) |
359 | sprockets-rails (>= 2.0, < 4.0) | 364 | sprockets-rails (>= 2.0, < 4.0) |
360 | tilt (>= 1.1, < 3) | 365 | tilt (>= 1.1, < 3) |
361 | - selenium-webdriver (2.52.0) | 366 | + selenium-webdriver (2.53.0) |
362 | childprocess (~> 0.5) | 367 | childprocess (~> 0.5) |
363 | - multi_json (~> 1.0) | ||
364 | rubyzip (~> 1.0) | 368 | rubyzip (~> 1.0) |
365 | websocket (~> 1.0) | 369 | websocket (~> 1.0) |
366 | slim (3.0.6) | 370 | slim (3.0.6) |
367 | temple (~> 0.7.3) | 371 | temple (~> 0.7.3) |
368 | tilt (>= 1.3.3, < 2.1) | 372 | tilt (>= 1.3.3, < 2.1) |
369 | - spring (1.6.1) | 373 | + spring (1.6.4) |
370 | sprockets (3.5.2) | 374 | sprockets (3.5.2) |
371 | concurrent-ruby (~> 1.0) | 375 | concurrent-ruby (~> 1.0) |
372 | rack (> 1, < 3) | 376 | rack (> 1, < 3) |
@@ -376,20 +380,19 @@ GEM | @@ -376,20 +380,19 @@ GEM | ||
376 | sprockets (>= 2.8, < 4.0) | 380 | sprockets (>= 2.8, < 4.0) |
377 | swagger-ui_rails (0.1.7) | 381 | swagger-ui_rails (0.1.7) |
378 | temple (0.7.6) | 382 | temple (0.7.6) |
379 | - test-unit (3.1.5) | 383 | + test-unit (3.1.8) |
380 | power_assert | 384 | power_assert |
381 | text (1.3.1) | 385 | text (1.3.1) |
382 | thor (0.19.1) | 386 | thor (0.19.1) |
383 | thread_safe (0.3.5) | 387 | thread_safe (0.3.5) |
384 | - tilt (2.0.1) | 388 | + tilt (2.0.2) |
385 | tzinfo (1.2.2) | 389 | tzinfo (1.2.2) |
386 | thread_safe (~> 0.1) | 390 | thread_safe (~> 0.1) |
387 | - uglifier (2.7.2) | ||
388 | - execjs (>= 0.3.0) | ||
389 | - json (>= 1.8.0) | 391 | + uglifier (3.0.0) |
392 | + execjs (>= 0.3.0, < 3) | ||
390 | unf (0.1.4) | 393 | unf (0.1.4) |
391 | unf_ext | 394 | unf_ext |
392 | - unf_ext (0.0.7.1) | 395 | + unf_ext (0.0.7.2) |
393 | unicorn (4.9.0) | 396 | unicorn (4.9.0) |
394 | kgio (~> 2.6) | 397 | kgio (~> 2.6) |
395 | rack | 398 | rack |