summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-13 10:35:16 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-13 10:35:16 -0800
commitbb1f8b1d8be3d2cfd4467ff78bff875498e1b0e2 (patch)
tree53a133b27d59dd6ec4f7e52a347c68ddf914ea21 /Gemfile
parent9ce7492e58d3a90cfd9a07be6ba5b0f4fafe7bc8 (diff)
parentef933a4a962e4ab12c448241ad500e229a569f21 (diff)
downloadgitlab-ce-bb1f8b1d8be3d2cfd4467ff78bff875498e1b0e2.tar.gz
Merge branch 'github_importer'
Conflicts: app/helpers/projects_helper.rb
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 54942fe4ac4..8769148baf0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -263,3 +263,5 @@ group :production do
end
gem "newrelic_rpm"
+
+gem 'octokit', '3.7.0'