Download as
Browse Code »

Commit 1d454e8a0fb63c6a6855f8de57825c138dc56a1d

Authored by Victor Costa
1 parent 1da65470
Exists in staging

Update Gemfile.lock

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