diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-10-06 06:41:27 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-10-06 06:50:15 -0700 |
| commit | 65a9b6189abb19a9cd9ceb69b4bbec55f797ecd2 (patch) | |
| tree | 6b4bb8997ff2152c4be1eef6a600d82f843bb056 | |
| parent | d7dd66ed561c48e8b698d750cd4f4ea32379ad30 (diff) | |
| download | gitlab-ce-sh-add-google-api-client.tar.gz | |
Add google-api-client to properly support Google Cloud backupsh-add-google-api-client
https://github.com/fog/fog-google#installation
Closes #23043
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 37 |
3 files changed, 41 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 864683efcdb..9d6c723d6d4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ v 8.13.0 (unreleased) - Add link from system note to compare with previous version - Use gitlab-shell v3.6.2 (GIT TRACE logging) - Fix centering of custom header logos (Ashley Dumaine) + - Add google-api-client gem to properly support Google Cloud backup - AbstractReferenceFilter caches project_refs on RequestStore when active - Replaced the check sign to arrow in the show build view. !6501 - Add a /wip slash command to toggle the Work In Progress status of a merge request. !6259 (tbalthazar) @@ -95,6 +95,9 @@ gem 'fog-rackspace', '~> 0.1.1' # for aws storage gem 'unf', '~> 0.1.4' +# for Google storage +gem 'google-api-client', '~> 0.8.6' + # Seed data gem 'seed-fu', '~> 2.3.5' diff --git a/Gemfile.lock b/Gemfile.lock index 96b49faf727..443e613d018 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,6 +62,10 @@ GEM attr_encrypted (3.0.3) encryptor (~> 3.0.0) attr_required (1.0.0) + autoparse (0.3.3) + addressable (>= 2.3.1) + extlib (>= 0.9.15) + multi_json (>= 1.0.0) autoprefixer-rails (6.2.3) execjs json @@ -196,6 +200,7 @@ GEM excon (0.52.0) execjs (2.6.0) expression_parser (0.9.0) + extlib (0.9.16) factory_girl (4.5.0) activesupport (>= 3.0.0) factory_girl_rails (4.6.0) @@ -309,6 +314,25 @@ GEM json multi_json request_store (>= 1.0) + google-api-client (0.8.7) + activesupport (>= 3.2, < 5.0) + addressable (~> 2.3) + autoparse (~> 0.3) + extlib (~> 0.9) + faraday (~> 0.9) + googleauth (~> 0.3) + launchy (~> 2.4) + multi_json (~> 1.10) + retriable (~> 1.4) + signet (~> 0.6) + googleauth (0.5.1) + faraday (~> 0.9) + jwt (~> 1.4) + logging (~> 2.0) + memoist (~> 0.12) + multi_json (~> 1.11) + os (~> 0.9) + signet (~> 0.7) grape (0.15.0) activesupport builder @@ -393,6 +417,10 @@ GEM listen (3.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) + little-plugger (1.1.4) + logging (2.1.0) + little-plugger (~> 1.1) + multi_json (~> 1.10) loofah (2.0.3) nokogiri (>= 1.5.9) macaddr (1.7.1) @@ -400,6 +428,7 @@ GEM mail (2.6.4) mime-types (>= 1.16, < 4) mail_room (0.8.0) + memoist (0.15.0) method_source (0.8.2) mime-types (2.99.3) mimemagic (0.3.0) @@ -485,6 +514,7 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) + os (0.9.6) paranoia (2.1.4) activerecord (~> 4.0) parser (2.3.1.4) @@ -590,6 +620,7 @@ GEM listen (~> 3.0) responders (2.3.0) railties (>= 4.2.0, < 5.1) + retriable (1.4.1) rinku (2.0.0) rotp (2.1.2) rouge (2.0.6) @@ -682,6 +713,11 @@ GEM redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) sidekiq (>= 4.0.0) + signet (0.7.3) + addressable (~> 2.3) + faraday (~> 0.9) + jwt (~> 1.5) + multi_json (~> 1.10) simplecov (0.12.0) docile (~> 1.1.0) json (>= 1.8, < 3) @@ -865,6 +901,7 @@ DEPENDENCIES gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.2) gon (~> 6.1.0) + google-api-client (~> 0.8.6) grape (~> 0.15.0) grape-entity (~> 0.4.2) haml_lint (~> 0.18.2) |