Add latest changes from gitlab-org/gitlab@master

.rubocop.yml

@@ -301,12 +301,6 @@ RSpec/AnyInstanceOf:
   Enabled: false
 # Cops for upgrade to gitlab-styles 3.1.0
-RSpec/ReceiveCounts:
-  Enabled: false
-
-RSpec/ContextMethod:
-  Enabled: false
-
 RSpec/ImplicitSubject:
   Enabled: false
@@ -343,6 +337,7 @@ RSpec/MissingExampleGroupArgument:
 RSpec/UnspecifiedException:
   Enabled: false
+# Work in progress. See https://gitlab.com/gitlab-org/gitlab/issues/196163
 RSpec/HaveGitlabHttpStatus:
   Enabled: true
   Include:
@@ -350,6 +345,8 @@ RSpec/HaveGitlabHttpStatus:
     - 'ee/spec/support/shared_examples/**/*'
     - 'spec/features/**/*'
     - 'ee/spec/features/**/*'
+    - 'spec/controllers/*.rb'
+    - 'ee/spec/controllers/*.rb'
 Style/MultilineWhenThen:
   Enabled: false

.rubocop_todo.yml

@@ -782,3 +782,129 @@ Style/UnneededSort:
   Exclude:
     - 'app/models/concerns/resolvable_discussion.rb'
     - 'lib/gitlab/highlight.rb'
+
+RSpec/ReceiveCounts:
+  Exclude:
+    - 'ee/spec/models/broadcast_message_spec.rb'
+    - 'ee/spec/services/geo/project_housekeeping_service_spec.rb'
+    - 'ee/spec/services/geo/repository_sync_service_spec.rb'
+    - 'spec/lib/gitlab/ci/build/rules/rule/clause/exists_spec.rb'
+    - 'spec/lib/gitlab/ci/trace/section_parser_spec.rb'
+    - 'spec/lib/gitlab/cleanup/project_uploads_spec.rb'
+    - 'spec/lib/gitlab/danger/teammate_spec.rb'
+    - 'spec/lib/gitlab/git_access_spec.rb'
+    - 'spec/lib/gitlab/gpg_spec.rb'
+    - 'spec/lib/gitlab/legacy_github_import/importer_spec.rb'
+    - 'spec/lib/gitlab/sanitizers/exif_spec.rb'
+    - 'spec/models/concerns/avatarable_spec.rb'
+    - 'spec/models/concerns/triggerable_hooks_spec.rb'
+    - 'spec/requests/api/graphql_spec.rb'
+    - 'spec/services/ci/ensure_stage_service_spec.rb'
+    - 'spec/services/clusters/cleanup/app_service_spec.rb'
+    - 'spec/services/notification_service_spec.rb'
+    - 'spec/services/projects/housekeeping_service_spec.rb'
+    - 'spec/tasks/gitlab/cleanup_rake_spec.rb'
+    - 'spec/uploaders/gitlab_uploader_spec.rb'
+    - 'spec/workers/create_gpg_signature_worker_spec.rb'
+
+RSpec/ContextMethod:
+  Exclude:
+    - 'ee/spec/controllers/ee/projects/autocomplete_sources_controller_spec.rb'
+    - 'ee/spec/controllers/groups/autocomplete_sources_controller_spec.rb'
+    - 'ee/spec/finders/geo/file_registry_finder_spec.rb'
+    - 'ee/spec/helpers/feature_flags_helper_spec.rb'
+    - 'ee/spec/lib/ee/gitlab/background_migration/migrate_approver_to_approval_rules_spec.rb'
+    - 'ee/spec/lib/ee/gitlab/ci/config/entry/trigger_spec.rb'
+    - 'ee/spec/lib/elastic/latest/snippet_instance_proxy_spec.rb'
+    - 'ee/spec/lib/gitlab/contribution_analytics/data_collector_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/replication/file_transfer_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/replication/job_artifact_downloader_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/replication/job_artifact_retriever_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/replication/job_artifact_transfer_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/replication/lfs_downloader_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/replication/lfs_retriever_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/replication/lfs_transfer_spec.rb'
+    - 'ee/spec/lib/gitlab/geo_spec.rb'
+    - 'ee/spec/models/approval_state_spec.rb'
+    - 'ee/spec/models/approval_wrapped_any_approver_rule_spec.rb'
+    - 'ee/spec/models/concerns/approval_rule_like_spec.rb'
+    - 'ee/spec/models/concerns/elastic/issue_spec.rb'
+    - 'ee/spec/models/concerns/elastic/note_spec.rb'
+    - 'ee/spec/models/concerns/elastic/project_spec.rb'
+    - 'ee/spec/models/concerns/epic_tree_sorting_spec.rb'
+    - 'ee/spec/models/concerns/has_timelogs_report_spec.rb'
+    - 'ee/spec/models/ee/clusters/applications/prometheus_spec.rb'
+    - 'ee/spec/models/ee/clusters/platforms/kubernetes_spec.rb'
+    - 'ee/spec/models/user_spec.rb'
+    - 'ee/spec/presenters/ci/pipeline_presenter_spec.rb'
+    - 'ee/spec/requests/api/epics_spec.rb'
+    - 'ee/spec/services/boards/update_service_spec.rb'
+    - 'ee/spec/services/ee/boards/issues/list_service_spec.rb'
+    - 'ee/spec/services/ee/merge_requests/refresh_service_spec.rb'
+    - 'ee/spec/services/groups/update_service_spec.rb'
+    - 'ee/spec/services/projects/create_from_template_service_spec.rb'
+    - 'ee/spec/services/projects/update_service_spec.rb'
+    - 'ee/spec/services/update_build_minutes_service_spec.rb'
+    - 'ee/spec/support/shared_examples/features/gold_trial_callout_shared_examples.rb'
+    - 'ee/spec/support/shared_examples/models/concerns/elastic/limited_indexing_shared_examples.rb'
+    - 'qa/spec/ee/scenario/test/integration/group_saml_spec.rb'
+    - 'qa/spec/resource/api_fabricator_spec.rb'
+    - 'qa/spec/scenario/test/integration/github_spec.rb'
+    - 'qa/spec/scenario/test/integration/instance_saml_spec.rb'
+    - 'qa/spec/scenario/test/integration/kubernetes_spec.rb'
+    - 'qa/spec/scenario/test/integration/ldap_spec.rb'
+    - 'qa/spec/scenario/test/integration/mattermost_spec.rb'
+    - 'qa/spec/scenario/test/integration/oauth_spec.rb'
+    - 'qa/spec/scenario/test/integration/object_storage_spec.rb'
+    - 'qa/spec/specs/runner_spec.rb'
+    - 'spec/controllers/application_controller_spec.rb'
+    - 'spec/controllers/projects/milestones_controller_spec.rb'
+    - 'spec/features/projects/blobs/blob_show_spec.rb'
+    - 'spec/finders/concerns/finder_with_cross_project_access_spec.rb'
+    - 'spec/helpers/diff_helper_spec.rb'
+    - 'spec/helpers/nav_helper_spec.rb'
+    - 'spec/helpers/sourcegraph_helper_spec.rb'
+    - 'spec/lib/container_registry/registry_spec.rb'
+    - 'spec/lib/container_registry/tag_spec.rb'
+    - 'spec/lib/gitlab/ci/trace/chunked_io_spec.rb'
+    - 'spec/lib/gitlab/content_security_policy/config_loader_spec.rb'
+    - 'spec/lib/gitlab/database/count_spec.rb'
+    - 'spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb'
+    - 'spec/lib/gitlab/git_ref_validator_spec.rb'
+    - 'spec/lib/gitlab/private_commit_email_spec.rb'
+    - 'spec/lib/gitlab/rugged_instrumentation_spec.rb'
+    - 'spec/lib/omni_auth/strategies/jwt_spec.rb'
+    - 'spec/lib/safe_zip/entry_spec.rb'
+    - 'spec/lib/safe_zip/extract_spec.rb'
+    - 'spec/models/badge_spec.rb'
+    - 'spec/models/badges/project_badge_spec.rb'
+    - 'spec/models/ci/artifact_blob_spec.rb'
+    - 'spec/models/ci/persistent_ref_spec.rb'
+    - 'spec/models/ci/runner_spec.rb'
+    - 'spec/models/concerns/routable_spec.rb'
+    - 'spec/models/deployment_spec.rb'
+    - 'spec/models/issue_spec.rb'
+    - 'spec/models/notification_recipient_spec.rb'
+    - 'spec/models/project_services/bamboo_service_spec.rb'
+    - 'spec/models/project_services/buildkite_service_spec.rb'
+    - 'spec/models/project_services/chat_message/issue_message_spec.rb'
+    - 'spec/models/project_services/drone_ci_service_spec.rb'
+    - 'spec/models/project_services/hipchat_service_spec.rb'
+    - 'spec/models/project_services/jira_service_spec.rb'
+    - 'spec/models/project_spec.rb'
+    - 'spec/models/remote_mirror_spec.rb'
+    - 'spec/models/user_spec.rb'
+    - 'spec/models/wiki_page_spec.rb'
+    - 'spec/requests/api/issues/get_group_issues_spec.rb'
+    - 'spec/requests/api/merge_requests_spec.rb'
+    - 'spec/serializers/diff_file_entity_spec.rb'
+    - 'spec/services/branches/delete_merged_service_spec.rb'
+    - 'spec/services/labels/available_labels_service_spec.rb'
+    - 'spec/services/projects/batch_open_issues_count_service_spec.rb'
+    - 'spec/services/projects/destroy_service_spec.rb'
+    - 'spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb'
+    - 'spec/services/projects/hashed_storage/rollback_attachments_service_spec.rb'
+    - 'spec/services/projects/open_issues_count_service_spec.rb'
+    - 'spec/services/quick_actions/interpret_service_spec.rb'
+    - 'spec/support/shared_examples/services/boards/issues_list_service_shared_examples.rb'
+    - 'spec/uploaders/namespace_file_uploader_spec.rb'
\ No newline at end of file

app/assets/javascripts/filtered_search/dropdown_operator.js

@@ -45,13 +45,13 @@ export default class DropdownOperator extends FilteredSearchDropdown {
         tag: 'equal',
         type: 'string',
         title: '=',
-        help: __('Is'),
+        help: __('is'),
       },
       {
         tag: 'not-equal',
         type: 'string',
         title: '!=',
-        help: __('Is not'),
+        help: __('is not'),
       },
     ];
     this.droplab.changeHookList(this.hookId, this.dropdown, [Filter], this.config);

app/assets/javascripts/ide/services/index.js

@@ -35,6 +35,7 @@ export default {
         joinPaths(
           gon.relative_url_root || '/',
           file.projectId,
+          '-',
           'raw',
           sha,
           escapeFileUrl(filePath),
@@ -67,7 +68,7 @@ export default {
     return Api.commitMultiple(projectId, payload);
   },
   getFiles(projectUrl, ref) {
-    const url = `${projectUrl}/files/${ref}`;
+    const url = `${projectUrl}/-/files/${ref}`;
     return axios.get(url, { params: { format: 'json' } });
   },
   lastCommitPipelines({ getters }) {

app/assets/javascripts/repository/components/breadcrumbs.vue

@@ -107,10 +107,10 @@ export default {
             return acc.concat({
               name,
               path,
-              to: `/tree/${this.ref}${path}`,
+              to: `/-/tree/${this.ref}${path}`,
             });
           },
-          [{ name: this.projectShortPath, path: '/', to: `/tree/${this.ref}/` }],
+          [{ name: this.projectShortPath, path: '/', to: `/-/tree/${this.ref}/` }],
         );
     },
     canCreateMrFromFork() {

app/assets/javascripts/repository/components/table/parent_row.vue

@@ -28,7 +28,7 @@ export default {
       return splitArray.join('/');
     },
     parentRoute() {
-      return { path: `/tree/${this.commitRef}/${this.parentPath}` };
+      return { path: `/-/tree/${this.commitRef}/${this.parentPath}` };
     },
   },
   methods: {

app/assets/javascripts/repository/components/table/row.vue

@@ -90,7 +90,7 @@ export default {
   },
   computed: {
     routerLinkTo() {
-      return this.isFolder ? { path: `/tree/${this.ref}/${this.path}` } : null;
+      return this.isFolder ? { path: `/-/tree/${this.ref}/${this.path}` } : null;
     },
     iconName() {
       return `fa-${getIconName(this.type, this.path)}`;

app/assets/javascripts/repository/router.js

@@ -12,7 +12,7 @@ export default function createRouter(base, baseRef) {
     base: joinPaths(gon.relative_url_root || '', base),
     routes: [
       {
-        path: `/tree/${baseRef}(/.*)?`,
+        path: `/-/tree/${baseRef}(/.*)?`,
         name: 'treePath',
         component: TreePage,
         props: route => ({

app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue

@@ -79,10 +79,10 @@ export default {
       return this.projectPath.indexOf('/') === 0 ? '' : `${gon.relative_url_root}/`;
     },
     fullOldPath() {
-      return `${this.basePath}${this.projectPath}/raw/${this.oldSha}/${this.oldPath}`;
+      return `${this.basePath}${this.projectPath}/-/raw/${this.oldSha}/${this.oldPath}`;
     },
     fullNewPath() {
-      return `${this.basePath}${this.projectPath}/raw/${this.newSha}/${this.newPath}`;
+      return `${this.basePath}${this.projectPath}/-/raw/${this.newSha}/${this.newPath}`;
     },
   },
 };

app/assets/javascripts/vue_shared/components/pagination/graphql_pagination.vue

-<script>
-import { GlButton } from '@gitlab/ui';
-import { PREV, NEXT } from '~/vue_shared/components/pagination/constants';
-
-/**
- * Pagination Component for graphql API
- */
-export default {
-  name: 'GraphqlPaginationComponent',
-  components: {
-    GlButton,
-  },
-  labels: {
-    prev: PREV,
-    next: NEXT,
-  },
-  props: {
-    hasNextPage: {
-      required: true,
-      type: Boolean,
-    },
-    hasPreviousPage: {
-      required: true,
-      type: Boolean,
-    },
-  },
-};
-</script>
-<template>
-  <div class="justify-content-center d-flex prepend-top-default">
-    <div class="btn-group">
-      <gl-button
-        class="js-prev-btn page-link"
-        :disabled="!hasPreviousPage"
-        @click="$emit('previousClicked')"
-        >{{ $options.labels.prev }}</gl-button
-      >
-
-      <gl-button
-        class="js-next-btn page-link"
-        :disabled="!hasNextPage"
-        @click="$emit('nextClicked')"
-        >{{ $options.labels.next }}</gl-button
-      >
-    </div>
-  </div>
-</template>

app/helpers/submodule_helper.rb

@@ -39,9 +39,9 @@ module SubmoduleHelper
       elsif relative_self_url?(url)
         relative_self_links(url, submodule_item_id, repository.project)
       elsif github_dot_com_url?(url)
-        standard_links('github.com', namespace, project, submodule_item_id)
+        github_com_tree_links(namespace, project, submodule_item_id)
       elsif gitlab_dot_com_url?(url)
-        standard_links('gitlab.com', namespace, project, submodule_item_id)
+        gitlab_com_tree_links(namespace, project, submodule_item_id)
       else
         [sanitize_submodule_url(url), nil]
       end
@@ -73,8 +73,13 @@ module SubmoduleHelper
     url.start_with?('../', './')
   end
-  def standard_links(host, namespace, project, commit)
-    base = ['https://', host, '/', namespace, '/', project].join('')
+  def gitlab_com_tree_links(namespace, project, commit)
+    base = ['https://gitlab.com/', namespace, '/', project].join('')
+    [base, [base, '/-/tree/', commit].join('')]
+  end
+
+  def github_com_tree_links(namespace, project, commit)
+    base = ['https://github.com/', namespace, '/', project].join('')
     [base, [base, '/tree/', commit].join('')]
   end

app/helpers/tree_helper.rb

@@ -38,13 +38,13 @@ module TreeHelper
   # many paths, as with a repository tree that has thousands of items.
   def fast_project_blob_path(project, blob_path)
     ActionDispatch::Journey::Router::Utils.escape_path(
-      File.join(relative_url_root, project.path_with_namespace, 'blob', blob_path)
+      File.join(relative_url_root, project.path_with_namespace, '-', 'blob', blob_path)
     )
   end
   def fast_project_tree_path(project, tree_path)
     ActionDispatch::Journey::Router::Utils.escape_path(
-      File.join(relative_url_root, project.path_with_namespace, 'tree', tree_path)
+      File.join(relative_url_root, project.path_with_namespace, '-', 'tree', tree_path)
     )
   end

app/models/key.rb

@@ -96,8 +96,7 @@ class Key < ApplicationRecord
   def remove_from_shell
     GitlabShellWorker.perform_async(
       :remove_key,
-      shell_id,
-      key
+      shell_id
     )
   end

app/models/repository.rb

@@ -447,6 +447,8 @@ class Repository
   def after_import
     expire_content_cache
+    return unless repo_type.project?
+
     # This call is stubbed in tests due to being an expensive operation
     # It can be reenabled for specific tests via:
     #

changelogs/unreleased/198655-lowercase-operator.yml

+---
+title: Switch dropdown operators to lowercase
+merge_request:
+author:
+type: other

changelogs/unreleased/35792-saml-bypass-2-factor-authentication-function-does-not-work-with-adf.yml

+---
+title: Support the bypass 2FA function with ADFS SAML
+merge_request: 23615
+author:
+type: fixed

changelogs/unreleased/do-not-create-pre-post-pipeline.yml

+---
+title: Require other stages than .pre and .post
+merge_request: 23629
+author:
+type: fixed

changelogs/unreleased/dz-scope-repository-routes.yml

+---
+title: Move repository routes under - scope
+merge_request: 20455
+author:
+type: deprecated

changelogs/unreleased/fj-avoid-calling-detect-languages-worker-wiki-repos.yml

+---
+title: Call DetectRepositoryLanguagesWorker only for project repositories
+merge_request: 23696
+author:
+type: fixed

config/routes/project.rb

@@ -286,6 +286,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         # The wiki and repository routing contains wildcard characters so
         # its preferable to keep it below all other project routes
         draw :repository_scoped
+        draw :repository
         draw :wiki
       end
       # End of the /-/ scope.
@@ -476,14 +477,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         post :web_ide_clientside_preview
       end
-      # The repository routing contains wildcard characters so
-      # its preferable to keep it below all other project routes
-      draw :repository
-
-      # To ensure an old unscoped routing is used for the UI we need to
-      # add prefix 'as' to the scope routing and place it below original routing.
+      # Deprecated unscoped routing.
       # Issue https://gitlab.com/gitlab-org/gitlab/issues/118849
-      scope '-', as: 'scoped' do
+      scope as: 'deprecated' do
         draw :repository
       end