diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-20 14:13:24 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-20 14:13:24 +0000 |
| commit | b80e6d7c171cba404aa3c2a8877ed7fc9d5eb92c (patch) | |
| tree | e25f5e196a825bc5badb1206fca46684274c5643 | |
| parent | 542b675cf60bb8208306d2c0cae138f4ccc47972 (diff) | |
| parent | 5d238ae819077c831092c6a72281cd81aea398e6 (diff) | |
| download | gitlab-ce-b80e6d7c171cba404aa3c2a8877ed7fc9d5eb92c.tar.gz | |
Merge branch 'migration-status' into 'master'
Add option to specify migration status on at the migration site
See merge request !12976
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 197a94487eb..435e41e36fb 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -86,8 +86,8 @@ module Gitlab feature.enabled? end - def self.migrate(feature) - is_enabled = feature_enabled?(feature) + def self.migrate(feature, status: MigrationStatus::OPT_IN) + is_enabled = feature_enabled?(feature, status: status) metric_name = feature.to_s metric_name += "_gitaly" if is_enabled |