diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2018-07-02 13:57:38 +0000 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2018-07-09 21:13:08 +0800 |
commit | 9286f5b9340f92131c320c231a5fb3e51c23bf04 (patch) | |
tree | 49bbb5c1ebc03a9fda46791273e949a8e467710f /lib | |
parent | 4ee08b77bc5ae11553d59c182ea8292b77699115 (diff) | |
download | gitlab-ce-9286f5b9340f92131c320c231a5fb3e51c23bf04.tar.gz |
Use stable gitlab-styles and eliminate offenses
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/git/repository.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/metrics/influx_db.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 324eac038e1..ef29a871be0 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1068,6 +1068,7 @@ module Gitlab true end + def multi_action( user, branch_name:, message:, actions:, author_email: nil, author_name: nil, @@ -1079,7 +1080,6 @@ module Gitlab start_branch_name, start_repository) end end - # rubocop:enable Metrics/ParameterLists def write_config(full_path:) return unless full_path.present? diff --git a/lib/gitlab/metrics/influx_db.rb b/lib/gitlab/metrics/influx_db.rb index 93cd6580d9a..04135dac4ff 100644 --- a/lib/gitlab/metrics/influx_db.rb +++ b/lib/gitlab/metrics/influx_db.rb @@ -162,7 +162,6 @@ module Gitlab # When enabled this should be set before being used as the usual pattern # "@foo ||= bar" is _not_ thread-safe. - # rubocop:disable Gitlab/ModuleWithInstanceVariables def pool if influx_metrics_enabled? if @pool.nil? |