diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-13 10:35:16 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-13 10:35:16 -0800 |
| commit | bb1f8b1d8be3d2cfd4467ff78bff875498e1b0e2 (patch) | |
| tree | 53a133b27d59dd6ec4f7e52a347c68ddf914ea21 /Gemfile.lock | |
| parent | 9ce7492e58d3a90cfd9a07be6ba5b0f4fafe7bc8 (diff) | |
| parent | ef933a4a962e4ab12c448241ad500e229a569f21 (diff) | |
| download | gitlab-ce-bb1f8b1d8be3d2cfd4467ff78bff875498e1b0e2.tar.gz | |
Merge branch 'github_importer'
Conflicts:
app/helpers/projects_helper.rb
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e36c2603d9b..94e29735b71 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -318,6 +318,8 @@ GEM jwt (~> 0.1.4) multi_json (~> 1.0) rack (~> 1.2) + octokit (3.7.0) + sawyer (~> 0.6.0, >= 0.5.3) omniauth (1.1.4) hashie (>= 1.2, < 3) rack @@ -472,6 +474,9 @@ GEM sass (~> 3.2.0) sprockets (~> 2.8, <= 2.11.0) sprockets-rails (~> 2.0) + sawyer (0.6.0) + addressable (~> 2.3.5) + faraday (~> 0.8, < 0.10) sdoc (0.3.20) json (>= 1.1.3) rdoc (~> 3.10) @@ -671,6 +676,7 @@ DEPENDENCIES mysql2 newrelic_rpm nprogress-rails + octokit (= 3.7.0) omniauth (~> 1.1.3) omniauth-github omniauth-google-oauth2 |