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:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-08-18 19:13:38 +0400
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-08-18 19:13:38 +0400
commit2fd7d6e2efd6c0bd86c85900f8279db8ac172f3f (patch)
tree7ccb71fa1f81e341f98898911a428c51b528eeaf /Gemfile.lock
parent97288920d6d25affbe6f5d75e612a5e8cd832a01 (diff)
parent3a246fbd38c8b0b3aea9881a5fbc6d868551ca51 (diff)
Merge pull request #7493 from Razer6/update_gems_with_errors
Update gems with errors, to prevent 500 errors
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock8
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 500e80ce4ee..f102150bc16 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -158,7 +158,7 @@ GEM
dotenv (>= 0.7)
thor (>= 0.13.6)
formatador (0.2.4)
- gemnasium-gitlab-service (0.2.1)
+ gemnasium-gitlab-service (0.2.2)
rugged (~> 0.19)
gherkin-ruby (0.3.1)
racc
@@ -323,8 +323,8 @@ GEM
omniauth-twitter (1.0.1)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
- org-ruby (0.9.1)
- rubypants (>= 0.2.0)
+ org-ruby (0.9.8)
+ rubypants (~> 0.2)
orm_adapter (0.5.0)
pg (0.15.1)
phantomjs (1.9.2.0)
@@ -642,7 +642,7 @@ DEPENDENCIES
omniauth-github
omniauth-google-oauth2
omniauth-twitter
- org-ruby (= 0.9.1)
+ org-ruby
pg
poltergeist (~> 1.5.1)
pry