diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-11-23 12:54:33 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-11-23 12:54:33 +0300 |
| commit | 21fb2f6dd8dce56e1b462da326a5ee1721acd19c (patch) | |
| tree | 4f7f9bac324a2da8e07973b7985144e1e404961f | |
| parent | 9d46bbdc7d65de8316436ea984afcddab5f4fcf2 (diff) | |
Vendoring Gitlab::Git requires RequestStore and constantszj-fix-vendor-testing
| -rwxr-xr-x | _support/vendor-gitlab-git | 2 | ||||
| -rw-r--r-- | ruby/Gemfile | 1 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 2 | ||||
| -rw-r--r-- | ruby/lib/gitlab/gitaly_client.rb | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/_support/vendor-gitlab-git b/_support/vendor-gitlab-git index f8f18f7cc..9c7d53148 100755 --- a/_support/vendor-gitlab-git +++ b/_support/vendor-gitlab-git @@ -21,7 +21,7 @@ def main Dir.mktmpdir do |dir| gitlab_dir = File.join(dir, 'gitlab') - run!(%W[git clone --depth=1 -b #{revision} #{REMOTE}.git #{gitlab_dir}]) + run!(%W[git clone -q --depth=1 -b #{revision} #{REMOTE}.git #{gitlab_dir}]) revision_sha = capture!(%w[git rev-parse HEAD], gitlab_dir).chomp FileUtils.rm_rf(VENDOR_DIR) diff --git a/ruby/Gemfile b/ruby/Gemfile index 3055ec8b2..adf6b5f36 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -5,6 +5,7 @@ gem 'gitaly-proto', '~> 0.54.0', require: 'gitaly' gem 'activesupport' gem 'gollum-lib', '~> 4.2', require: false gem 'gollum-rugged_adapter', '~> 0.4.4', require: false +gem 'request_store', '~> 1.3' group :development, :test do gem 'gitlab-styles', '~> 2.0.0', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 25daf8e09..dec418964 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -87,6 +87,7 @@ GEM rainbow (2.2.2) rake rake (12.1.0) + request_store (1.3.2) rouge (2.2.1) rubocop (0.50.0) parallel (~> 1.10) @@ -124,6 +125,7 @@ DEPENDENCIES gitlab-styles (~> 2.0.0) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) + request_store (~> 1.3) BUNDLED WITH 1.16.0 diff --git a/ruby/lib/gitlab/gitaly_client.rb b/ruby/lib/gitlab/gitaly_client.rb index 5e7b71559..1681b4549 100644 --- a/ruby/lib/gitlab/gitaly_client.rb +++ b/ruby/lib/gitlab/gitaly_client.rb @@ -2,6 +2,8 @@ module Gitlab module GitalyClient module MigrationStatus OPT_IN = :fake_constant + OPT_OUT = :fake_constant + DISABLED = :fake_constant end class << self |