Add latest changes from gitlab-org/gitlab@master

1 files changed, 64 insertions, 0 deletions

diff --git a/.rubocop_todo/style/sole_nested_conditional.yml b/.rubocop_todo/style/sole_nested_conditional.yml
new file mode 100644
index 00000000000..620d66a272c
--- /dev/null
+++ b/.rubocop_todo/style/sole_nested_conditional.yml
@@ -0,0 +1,64 @@
+---
+Style/SoleNestedConditional:
+  # Offense count: 64
+  # Temporarily disabled due to too many offenses
+  Enabled: false
+  Exclude:
+    - 'app/controllers/admin/application_settings_controller.rb'
+    - 'app/controllers/ldap/omniauth_callbacks_controller.rb'
+    - 'app/controllers/omniauth_callbacks_controller.rb'
+    - 'app/controllers/projects/blob_controller.rb'
+    - 'app/helpers/namespaces_helper.rb'
+    - 'app/helpers/nav_helper.rb'
+    - 'app/helpers/selects_helper.rb'
+    - 'app/models/concerns/cache_markdown_field.rb'
+    - 'app/models/external_pull_request.rb'
+    - 'app/models/issue.rb'
+    - 'app/models/network/graph.rb'
+    - 'app/models/packages/package.rb'
+    - 'app/models/protected_branch.rb'
+    - 'app/services/ci/register_job_service.rb'
+    - 'app/services/concerns/update_visibility_level.rb'
+    - 'app/services/incident_management/incidents/create_service.rb'
+    - 'app/services/merge_requests/update_service.rb'
+    - 'app/services/packages/generic/create_package_file_service.rb'
+    - 'app/services/packages/maven/find_or_create_package_service.rb'
+    - 'app/services/projects/container_repository/delete_tags_service.rb'
+    - 'app/services/projects/create_service.rb'
+    - 'app/services/projects/hashed_storage/migration_service.rb'
+    - 'app/services/projects/hashed_storage/rollback_service.rb'
+    - 'ee/app/finders/ee/snippets_finder.rb'
+    - 'ee/app/services/ee/issue_links/create_service.rb'
+    - 'ee/app/services/ee/lfs/unlock_file_service.rb'
+    - 'ee/app/services/epics/tree_reorder_service.rb'
+    - 'ee/app/services/geo/framework_repository_sync_service.rb'
+    - 'ee/app/services/geo/repository_base_sync_service.rb'
+    - 'ee/app/services/vulnerability_feedback/create_service.rb'
+    - 'ee/app/workers/ee/post_receive.rb'
+    - 'ee/lib/ee/gitlab/auth/o_auth/auth_hash.rb'
+    - 'ee/lib/ee/gitlab/checks/push_rules/commit_check.rb'
+    - 'ee/lib/elastic/latest/application_class_proxy.rb'
+    - 'ee/lib/elastic/latest/issue_class_proxy.rb'
+    - 'ee/lib/gitlab/code_owners/groups_loader.rb'
+    - 'lib/api/ci/helpers/runner.rb'
+    - 'lib/api/deploy_keys.rb'
+    - 'lib/api/helpers/label_helpers.rb'
+    - 'lib/api/users.rb'
+    - 'lib/banzai/filter/ascii_doc_sanitization_filter.rb'
+    - 'lib/banzai/filter/base_sanitization_filter.rb'
+    - 'lib/gitlab/auth.rb'
+    - 'lib/gitlab/auth/saml/user.rb'
+    - 'lib/gitlab/ci/pipeline/chain/skip.rb'
+    - 'lib/gitlab/config/entry/configurable.rb'
+    - 'lib/gitlab/config/entry/validators.rb'
+    - 'lib/gitlab/database/each_database.rb'
+    - 'lib/gitlab/email/handler/reply_processing.rb'
+    - 'lib/gitlab/user_access.rb'
+    - 'lib/gitlab/utils.rb'
+    - 'lib/gitlab/x509/signature.rb'
+    - 'lib/kramdown/converter/commonmark.rb'
+    - 'lib/mattermost/session.rb'
+    - 'lib/object_storage/direct_upload.rb'
+    - 'qa/qa/flow/login.rb'
+    - 'qa/qa/support/page_error_checker.rb'
+    - 'spec/spec_helper.rb'