Commit 1d454e8a0fb63c6a6855f8de57825c138dc56a1d
1 parent
1da65470
Exists in
staging
Update Gemfile.lock
Showing
1 changed file
with
15 additions
and
19 deletions
Show diff stats
Gemfile.lock
... | ... | @@ -21,14 +21,14 @@ PATH |
21 | 21 | access_control (0.0.0) |
22 | 22 | |
23 | 23 | PATH |
24 | - remote: vendor/plugins/action_tracker_has_comments | |
24 | + remote: vendor/plugins/action_tracker | |
25 | 25 | specs: |
26 | - action_tracker_has_comments (0.0.0) | |
26 | + action_tracker (0.0.1) | |
27 | 27 | |
28 | 28 | PATH |
29 | - remote: vendor/plugins/action_tracker | |
29 | + remote: vendor/plugins/action_tracker_has_comments | |
30 | 30 | specs: |
31 | - action_tracker (0.0.1) | |
31 | + action_tracker_has_comments (0.0.0) | |
32 | 32 | |
33 | 33 | PATH |
34 | 34 | remote: vendor/plugins/acts_as_list |
... | ... | @@ -178,23 +178,18 @@ GEM |
178 | 178 | coercible (1.0.0) |
179 | 179 | descendants_tracker (~> 0.0.1) |
180 | 180 | concurrent-ruby (1.0.1) |
181 | - cucumber (2.3.3) | |
181 | + cucumber (1.3.20) | |
182 | 182 | builder (>= 2.1.2) |
183 | - cucumber-core (~> 1.4.0) | |
184 | - cucumber-wire (~> 0.0.1) | |
185 | 183 | diff-lcs (>= 1.1.3) |
186 | - gherkin (~> 3.2.0) | |
184 | + gherkin (~> 2.12) | |
187 | 185 | multi_json (>= 1.7.5, < 2.0) |
188 | 186 | multi_test (>= 0.1.2) |
189 | - cucumber-core (1.4.0) | |
190 | - gherkin (~> 3.2.0) | |
191 | - cucumber-rails (1.4.3) | |
187 | + cucumber-rails (1.4.5) | |
192 | 188 | capybara (>= 1.1.2, < 3) |
193 | - cucumber (>= 1.3.8, < 3) | |
189 | + cucumber (>= 1.3.8, < 4) | |
194 | 190 | mime-types (>= 1.16, < 4) |
195 | 191 | nokogiri (~> 1.5) |
196 | - railties (>= 3, < 5) | |
197 | - cucumber-wire (0.0.1) | |
192 | + railties (>= 3, < 5.1) | |
198 | 193 | daemons (1.2.3) |
199 | 194 | dalli (2.7.6) |
200 | 195 | database_cleaner (1.5.1) |
... | ... | @@ -209,6 +204,8 @@ GEM |
209 | 204 | diffy (3.1.0) |
210 | 205 | domain_name (0.5.20160310) |
211 | 206 | unf (>= 0.0.5, < 1.0.0) |
207 | + doorkeeper (3.1.0) | |
208 | + railties (>= 3.2) | |
212 | 209 | eita-jrails (0.10.1) |
213 | 210 | actionpack (>= 3.1.0) |
214 | 211 | activesupport (>= 3.0.0) |
... | ... | @@ -223,7 +220,8 @@ GEM |
223 | 220 | gettext (3.2.1) |
224 | 221 | locale (>= 2.0.5) |
225 | 222 | text (>= 1.3.0) |
226 | - gherkin (3.2.0) | |
223 | + gherkin (2.12.2) | |
224 | + multi_json (~> 1.3) | |
227 | 225 | git-version-bump (0.15.1) |
228 | 226 | globalid (0.3.6) |
229 | 227 | activesupport (>= 4.1.0) |
... | ... | @@ -429,7 +427,7 @@ DEPENDENCIES |
429 | 427 | api-pagination (>= 4.1.1) |
430 | 428 | capybara (~> 2.2) |
431 | 429 | contacts (> 0.0.0)! |
432 | - cucumber | |
430 | + cucumber (~> 1.3) | |
433 | 431 | cucumber-rails (~> 1.4.2) |
434 | 432 | daemons (~> 1.1) |
435 | 433 | dalli (~> 2.7.0) |
... | ... | @@ -437,6 +435,7 @@ DEPENDENCIES |
437 | 435 | delayed_job |
438 | 436 | delayed_job_active_record |
439 | 437 | diffy (~> 3.0) |
438 | + doorkeeper (~> 3.1.0) | |
440 | 439 | eita-jrails (~> 0.10.0) |
441 | 440 | exception_notification (~> 4.0.1) |
442 | 441 | ezcrypto (= 0.0.0)! |
... | ... | @@ -492,6 +491,3 @@ DEPENDENCIES |
492 | 491 | whenever (= 0.9.4) |
493 | 492 | will_paginate (~> 3.0.7) |
494 | 493 | xss_terminate (= 0.0.0)! |
495 | - | |
496 | -BUNDLED WITH | |
497 | - 1.11.2 | ... | ... |