From 6b9b8a52ba3ffc3ec3f20d36e33af3dace089e99 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 16 Sep 2020 06:09:24 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/rails.gitlab-ci.yml | 2 +- .../diffs/store/getters_versions_dropdowns.js | 31 +- .../components/test_reports/test_reports.vue | 7 +- .../confidential_issue_sidebar.vue | 10 +- .../projects/merge_requests_controller.rb | 5 + .../delete_jobs_response_type.rb | 2 +- .../types/award_emojis/award_emoji_type.rb | 2 +- .../design_at_version_type.rb | 4 +- .../design_collection_type.rb | 2 +- .../sentry_detailed_error_type.rb | 2 +- .../sentry_error_collection_type.rb | 4 +- .../sentry_error_stack_trace_entry_type.rb | 2 +- .../sentry_error_stack_trace_type.rb | 2 +- .../types/error_tracking/sentry_error_type.rb | 2 +- app/graphql/types/issue_status_counts_type.rb | 2 +- app/graphql/types/milestone_type.rb | 2 +- .../types/mutation_operation_mode_enum.rb | 2 +- app/models/jira_import_state.rb | 4 - .../projects/merge_requests/show.html.haml | 7 +- .../_apply_template_warning.html.haml | 2 +- app/views/shared/issuable/_form.html.haml | 2 +- .../244277-remove-ff-recent-items-search.yml | 5 + changelogs/unreleased/issue-type-spacing.yml | 5 + .../development/recent_items_search.yml | 7 - .../graphql/reference/gitlab_schema.graphql | 66 +-- doc/api/graphql/reference/gitlab_schema.json | 66 +-- doc/api/graphql/reference/index.md | 380 +++++++++--------- doc/user/search/index.md | 1 + lib/gitlab/graphql/docs/helper.rb | 2 +- lib/gitlab/search/recent_issues.rb | 8 - lib/gitlab/usage_data.rb | 2 +- lib/gitlab/usage_data_queries.rb | 6 + lib/gitlab/utils/usage_data.rb | 6 + .../merge_requests_controller_spec.rb | 16 + .../projects/pipelines/pipeline_spec.rb | 2 +- .../test_reports/test_reports_spec.js | 11 +- .../confidential_issue_sidebar_spec.js.snap | 24 +- spec/lib/gitlab/search/recent_issues_spec.rb | 36 -- spec/lib/gitlab/usage_data_queries_spec.rb | 6 + spec/lib/gitlab/utils/usage_data_spec.rb | 22 + 40 files changed, 394 insertions(+), 375 deletions(-) create mode 100644 changelogs/unreleased/244277-remove-ff-recent-items-search.yml create mode 100644 changelogs/unreleased/issue-type-spacing.yml delete mode 100644 config/feature_flags/development/recent_items_search.yml diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 53abdf5bb38..165476678bb 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -507,7 +507,7 @@ rspec-ee system pg12 geo: # EE: Canonical MR pipelines rspec fail-fast: extends: - - .rspec-base-pg11 + - .rspec-ee-base-pg11 # This job also runs EE spec which needs elasticsearch - .rails:rules:rspec fail-fast stage: test needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets", "detect-tests"] diff --git a/app/assets/javascripts/diffs/store/getters_versions_dropdowns.js b/app/assets/javascripts/diffs/store/getters_versions_dropdowns.js index 1e8e736c028..135b1c61ef5 100644 --- a/app/assets/javascripts/diffs/store/getters_versions_dropdowns.js +++ b/app/assets/javascripts/diffs/store/getters_versions_dropdowns.js @@ -11,17 +11,26 @@ export const diffCompareDropdownTargetVersions = (state, getters) => { // startVersion only exists if the user has selected a version other // than "base" so if startVersion is null then base must be selected - const diffHead = parseBoolean(getParameterByName('diff_head')); + const defaultMergeRefForDiffs = window.gon?.features?.defaultMergeRefForDiffs || false; + const diffHeadParam = getParameterByName('diff_head'); + const diffHead = parseBoolean(diffHeadParam) || (!diffHeadParam && defaultMergeRefForDiffs); const isBaseSelected = !state.startVersion && !diffHead; const isHeadSelected = !state.startVersion && diffHead; + let baseVersion = null; - const baseVersion = { - versionName: state.targetBranchName, - version_index: DIFF_COMPARE_BASE_VERSION_INDEX, - href: state.mergeRequestDiff.base_version_path, - isBase: true, - selected: isBaseSelected, - }; + if ( + !defaultMergeRefForDiffs || + (defaultMergeRefForDiffs && !state.mergeRequestDiff.head_version_path) + ) { + baseVersion = { + versionName: state.targetBranchName, + version_index: DIFF_COMPARE_BASE_VERSION_INDEX, + href: state.mergeRequestDiff.base_version_path, + isBase: true, + selected: + isBaseSelected || (defaultMergeRefForDiffs && !state.mergeRequestDiff.head_version_path), + }; + } const headVersion = { versionName: state.targetBranchName, @@ -40,7 +49,11 @@ export const diffCompareDropdownTargetVersions = (state, getters) => { }; }; - return [...state.mergeRequestDiffs.slice(1).map(formatVersion), baseVersion, headVersion]; + return [ + ...state.mergeRequestDiffs.slice(1).map(formatVersion), + baseVersion, + state.mergeRequestDiff.head_version_path && headVersion, + ].filter(a => a); }; export const diffCompareDropdownSourceVersions = (state, getters) => { diff --git a/app/assets/javascripts/pipelines/components/test_reports/test_reports.vue b/app/assets/javascripts/pipelines/components/test_reports/test_reports.vue index bc1d22e2976..c3398e90895 100644 --- a/app/assets/javascripts/pipelines/components/test_reports/test_reports.vue +++ b/app/assets/javascripts/pipelines/components/test_reports/test_reports.vue @@ -55,13 +55,14 @@ export default {