summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-05-15 12:47:39 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-05-15 12:47:39 -0700
commitd76520a3d091be232ce8a05fcaf605e2f268f821 (patch)
tree645a5673f7d18aeb1596890f3b8447331afa57d1
parent4011096ea996cc33a9889e7f30d54caf81f27b1c (diff)
parent459e2fd2ebde997fa6ec501bb0fe529a5cabc789 (diff)
downloadgitlab-ci-d76520a3d091be232ce8a05fcaf605e2f268f821.tar.gz
Merge pull request #156 from alexdo/master
Bumps rugged to version 0.18.0.b1, resolving GPG issues
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index c526052..47c0424 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,7 +38,7 @@ gem 'whenever', require: false
gem 'stamp'
# Git support
-gem 'rugged', '~> 0.17.0.b7'
+gem 'rugged', '~> 0.18.0.b1'
# Pagination
gem 'kaminari'
diff --git a/Gemfile.lock b/Gemfile.lock
index 36b6c7b..12b81a0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -180,7 +180,7 @@ GEM
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
rubyzip (0.9.9)
- rugged (0.17.0.b7)
+ rugged (0.18.0.gh.de28323)
sass (3.2.7)
sass-rails (3.2.6)
railties (~> 3.2.0)
@@ -274,7 +274,7 @@ DEPENDENCIES
rb-fsevent
rb-inotify
rspec-rails
- rugged (~> 0.17.0.b7)
+ rugged (~> 0.18.0.b1)
sass-rails (~> 3.2.3)
settingslogic
shoulda-matchers