diff options
| author | Job van der Voort <jobvandervoort@gmail.com> | 2015-05-21 10:38:22 +0200 |
|---|---|---|
| committer | Job van der Voort <jobvandervoort@gmail.com> | 2015-05-21 10:38:22 +0200 |
| commit | 3a3f4b41e67485e62b2e37cc395f3407b30a7d9e (patch) | |
| tree | 2af95de20055ae6efb95ecb21976e5e534162e63 /Gemfile.lock | |
| parent | 90b1019ab42985568025c26164dad869677e3e1d (diff) | |
| parent | 10620c5986dea30d6a2c9c5d7dcd15244bddec8e (diff) | |
| download | gitlab-ce-3a3f4b41e67485e62b2e37cc395f3407b30a7d9e.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 586036923f3..529131f09b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -338,7 +338,7 @@ GEM method_source (0.8.2) mime-types (1.25.1) mimemagic (0.3.0) - mini_portile (0.6.1) + mini_portile (0.6.2) minitest (5.3.5) mousetrap-rails (1.4.6) multi_json (1.10.1) @@ -350,7 +350,7 @@ GEM net-ssh (>= 2.6.5) net-ssh (2.8.0) newrelic_rpm (3.9.4.245) - nokogiri (1.6.5) + nokogiri (1.6.6.2) mini_portile (~> 0.6.0) nprogress-rails (0.1.2.3) oauth (0.4.7) @@ -802,7 +802,7 @@ DEPENDENCIES spring-commands-spinach (= 1.0.0) stamp state_machine - task_list (~> 1.0.0) + task_list (= 1.0.2) test_after_commit thin tinder (~> 1.9.2) |