Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-28 16:58:15 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-28 16:58:15 +0300
commitdeb700419db6bfb49fab357a19be223b881e530a (patch)
tree982e39972a0160902af79ffb84bd54d73acb3f5e /Gemfile.lock
parentf9c929b31340ee3edc4b5d67c7f6140294403354 (diff)
parenteb3c4255bf1926a1edf02c2a4792feaaf6fe4091 (diff)
Merge branch 'rs-update-nprogress-rails' into 'master'
Bump nprogress-rails to 0.1.6.7 Closes #2866 See merge request !1686
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 340eb0fc301..65abc45ff19 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -406,7 +406,7 @@ GEM
newrelic_rpm (3.9.4.245)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
- nprogress-rails (0.1.2.3)
+ nprogress-rails (0.1.6.7)
oauth (0.4.7)
oauth2 (1.0.0)
faraday (>= 0.8, < 0.10)
@@ -854,7 +854,7 @@ DEPENDENCIES
nested_form (~> 0.3.2)
newrelic-grape
newrelic_rpm (~> 3.9.4.245)
- nprogress-rails (~> 0.1.2.3)
+ nprogress-rails (~> 0.1.6.7)
oauth2 (~> 1.0.0)
octokit (~> 3.7.0)
omniauth (~> 1.2.2)