From 1d454e8a0fb63c6a6855f8de57825c138dc56a1d Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Mon, 3 Oct 2016 09:53:52 -0300 Subject: [PATCH] Update Gemfile.lock --- Gemfile.lock | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fa6188d..e345e60 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,14 +21,14 @@ PATH access_control (0.0.0) PATH - remote: vendor/plugins/action_tracker_has_comments + remote: vendor/plugins/action_tracker specs: - action_tracker_has_comments (0.0.0) + action_tracker (0.0.1) PATH - remote: vendor/plugins/action_tracker + remote: vendor/plugins/action_tracker_has_comments specs: - action_tracker (0.0.1) + action_tracker_has_comments (0.0.0) PATH remote: vendor/plugins/acts_as_list @@ -178,23 +178,18 @@ GEM coercible (1.0.0) descendants_tracker (~> 0.0.1) concurrent-ruby (1.0.1) - cucumber (2.3.3) + cucumber (1.3.20) builder (>= 2.1.2) - cucumber-core (~> 1.4.0) - cucumber-wire (~> 0.0.1) diff-lcs (>= 1.1.3) - gherkin (~> 3.2.0) + gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) - cucumber-core (1.4.0) - gherkin (~> 3.2.0) - cucumber-rails (1.4.3) + cucumber-rails (1.4.5) capybara (>= 1.1.2, < 3) - cucumber (>= 1.3.8, < 3) + cucumber (>= 1.3.8, < 4) mime-types (>= 1.16, < 4) nokogiri (~> 1.5) - railties (>= 3, < 5) - cucumber-wire (0.0.1) + railties (>= 3, < 5.1) daemons (1.2.3) dalli (2.7.6) database_cleaner (1.5.1) @@ -209,6 +204,8 @@ GEM diffy (3.1.0) domain_name (0.5.20160310) unf (>= 0.0.5, < 1.0.0) + doorkeeper (3.1.0) + railties (>= 3.2) eita-jrails (0.10.1) actionpack (>= 3.1.0) activesupport (>= 3.0.0) @@ -223,7 +220,8 @@ GEM gettext (3.2.1) locale (>= 2.0.5) text (>= 1.3.0) - gherkin (3.2.0) + gherkin (2.12.2) + multi_json (~> 1.3) git-version-bump (0.15.1) globalid (0.3.6) activesupport (>= 4.1.0) @@ -429,7 +427,7 @@ DEPENDENCIES api-pagination (>= 4.1.1) capybara (~> 2.2) contacts (> 0.0.0)! - cucumber + cucumber (~> 1.3) cucumber-rails (~> 1.4.2) daemons (~> 1.1) dalli (~> 2.7.0) @@ -437,6 +435,7 @@ DEPENDENCIES delayed_job delayed_job_active_record diffy (~> 3.0) + doorkeeper (~> 3.1.0) eita-jrails (~> 0.10.0) exception_notification (~> 4.0.1) ezcrypto (= 0.0.0)! @@ -492,6 +491,3 @@ DEPENDENCIES whenever (= 0.9.4) will_paginate (~> 3.0.7) xss_terminate (= 0.0.0)! - -BUNDLED WITH - 1.11.2 -- libgit2 0.21.2