Merge branch 'disable_cops' into 'master'

Disable Style/MultilineIfModifier cop as its useful for our case

See merge request gitlab-org/omnibus-gitlab!4448

.rubocop.yml

@@ -71,3 +71,6 @@ Cop/AvoidUsingEnv:
     - docker/**/*
     - lib/gitlab/util.rb
     - spec/gitlab/util_spec.rb
+
+Style/MultilineIfModifier:
+  Enabled: false

files/gitlab-cookbooks/gitlab-ee/libraries/fdw_helper.rb

-class FdwHelper # rubocop:disable Style/MultilineIfModifier (disabled so we can use `unless defined?(GitlabGeoHelper)` at the end of the class definition)
+class FdwHelper
   FOREIGN_SCHEMA = 'gitlab_secondary'.freeze
   DEFAULT_SCHEMA = 'public'.freeze

files/gitlab-cookbooks/gitlab-ee/libraries/gitlab_geo_helper.rb

-class GitlabGeoHelper # rubocop:disable Style/MultilineIfModifier (disabled so we can use `unless defined?(GitlabGeoHelper)` at the end of the class definition)
+class GitlabGeoHelper
   REVISION_FILE ||= '/opt/gitlab/embedded/service/gitlab-rails/REVISION'.freeze
   attr_reader :node

files/gitlab-cookbooks/gitlab/libraries/gitlab_rails.rb

@@ -17,11 +17,7 @@
 require_relative 'nginx.rb'
 require_relative '../../gitaly/libraries/gitaly.rb'
-module GitlabRails # rubocop:disable Style/MultilineIfModifier
-  # The guard clause at the end of this module is used only to get the tests
-  # running. It prevents reloading of the module during converging, so tests
-  # pass. Hence, disabling the cop.
-
+module GitlabRails
   class << self
     def parse_variables
       parse_database_adapter

files/gitlab-cookbooks/mattermost/libraries/mattermost_helper.rb

 require_relative '../../gitlab/libraries/helpers/authorizer_helper'
 require_relative '../../package/libraries/helpers/shell_out_helper'
-class MattermostHelper # rubocop:disable Style/MultilineIfModifier (disabled so we can use `unless defined?(MattermostHelper)` at the end of the class definition)
+class MattermostHelper
   extend ShellOutHelper
   extend AuthorizeHelper

files/gitlab-cookbooks/package/libraries/config/roles/default.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
-module DefaultRole # rubocop:disable Style/MultilineIfModifier (disabled so we can use `unless defined?(DefaultRole)` at the end of the class definition)
+module DefaultRole
   class << self
     def load_role
       # Default role is only enabled if no other service role is enabled

files/gitlab-cookbooks/package/libraries/helpers/services_helper.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
-module Services # rubocop:disable Style/MultilineIfModifier (disabled so we can use `unless defined?(Services)` at the end of the class definition)
+module Services
   ALL_SERVICES = 'all'.freeze
   ALL_GROUPS = 'all-groups'.freeze
   SYSTEM_GROUP = 'system'.freeze

files/gitlab-cookbooks/package/libraries/helpers/version_helper.rb

 require_relative 'shell_out_helper'
-class VersionHelper # rubocop:disable Style/MultilineIfModifier (disabled so we can use `unless defined?(VersionHelper)` at the end of the class definition)
+class VersionHelper
   extend ShellOutHelper
   def self.version(cmd, env: {})

files/gitlab-cookbooks/package/libraries/omnibus_helper.rb

@@ -2,7 +2,7 @@ require 'mixlib/shellout'
 require_relative 'helper'
 require_relative 'deprecations'
-class OmnibusHelper # rubocop:disable Style/MultilineIfModifier (disabled so we can use `unless defined?(OmnibusHelper)` at the end of the class definition)
+class OmnibusHelper
   include ShellOutHelper
   attr_reader :node