From 23e66f03108f811dbb6f9aa4fc463f888666522d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 10 Mar 2021 00:09:13 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_manual_todo.yml | 1 + .../components/board_add_new_column.vue | 14 +- .../components/board_add_new_column_form.vue | 17 +- .../boards/components/board_content.vue | 2 +- .../issues_list/components/issuable.vue | 6 +- app/helpers/issuables_helper.rb | 2 +- app/models/ci/build.rb | 1 + app/models/ci/pipeline.rb | 1 + app/views/projects/issues/_issue.html.haml | 2 +- .../22901-add-predefined-variable.yml | 5 + .../246959-msj-opened-created-ui.yml | 5 + .../graphql/reference/gitlab_schema.graphql | 29597 ------ doc/api/graphql/reference/gitlab_schema.json | 85893 ---------------- doc/api/graphql/reference/index.md | 9 + doc/ci/variables/predefined_variables.md | 2 + .../variables/where_variables_can_be_used.md | 1 + doc/install/postgresql_extensions.md | 8 +- doc/install/requirements.md | 22 +- doc/update/upgrading_from_source.md | 7 +- .../application_security/api_fuzzing/index.md | 3 + doc/user/profile/notifications.md | 1 + doc/user/project/merge_requests/drafts.md | 4 + .../branches/img/branch_filter_search_box.png | Bin 23522 -> 0 bytes .../img/branch_filter_search_box_v13_10.png | Bin 0 -> 48672 bytes .../branches/img/compare_branches.png | Bin 62436 -> 0 bytes .../branches/img/compare_branches_v13_10.png | Bin 0 -> 82538 bytes .../repository_filter_search_box_v13_10.png | Bin 0 -> 17166 bytes doc/user/project/repository/branches/index.md | 20 +- doc/user/project/repository/web_editor.md | 2 +- locale/gitlab.pot | 30 +- .../issues_list/components/issuable_spec.js | 4 +- spec/models/ci/build_spec.rb | 2 + spec/models/ci/pipeline_spec.rb | 1 + 33 files changed, 130 insertions(+), 115532 deletions(-) create mode 100644 changelogs/unreleased/22901-add-predefined-variable.yml create mode 100644 changelogs/unreleased/246959-msj-opened-created-ui.yml delete mode 100644 doc/api/graphql/reference/gitlab_schema.graphql delete mode 100644 doc/api/graphql/reference/gitlab_schema.json delete mode 100644 doc/user/project/repository/branches/img/branch_filter_search_box.png create mode 100644 doc/user/project/repository/branches/img/branch_filter_search_box_v13_10.png delete mode 100644 doc/user/project/repository/branches/img/compare_branches.png create mode 100644 doc/user/project/repository/branches/img/compare_branches_v13_10.png create mode 100644 doc/user/project/repository/branches/img/repository_filter_search_box_v13_10.png diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index 634c0a2e55c..38e4077682a 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -2278,6 +2278,7 @@ Gitlab/NamespacedClass: - 'ee/app/policies/instance_security_dashboard_policy.rb' - 'ee/app/policies/issuable_metric_image_policy.rb' - 'ee/app/policies/iteration_policy.rb' + - 'ee/app/policies/push_rule_policy.rb' - 'ee/app/policies/saml_provider_policy.rb' - 'ee/app/policies/timelog_policy.rb' - 'ee/app/policies/vulnerability_policy.rb' diff --git a/app/assets/javascripts/boards/components/board_add_new_column.vue b/app/assets/javascripts/boards/components/board_add_new_column.vue index bec6365bf34..3c7c792b787 100644 --- a/app/assets/javascripts/boards/components/board_add_new_column.vue +++ b/app/assets/javascripts/boards/components/board_add_new_column.vue @@ -30,7 +30,7 @@ export default { }, computed: { ...mapState(['labels', 'labelsLoading']), - ...mapGetters(['getListByLabelId', 'shouldUseGraphQL', 'isEpicBoard']), + ...mapGetters(['getListByLabelId', 'shouldUseGraphQL']), selectedLabel() { if (!this.selectedId) { return null; @@ -47,7 +47,7 @@ export default { methods: { ...mapActions(['createList', 'fetchLabels', 'highlightList', 'setAddColumnFormVisibility']), highlight(listId) { - if (this.shouldUseGraphQL || this.isEpicBoard) { + if (this.shouldUseGraphQL) { this.highlightList(listId); } else { const list = boardsStore.state.lists.find(({ id }) => id === listId); @@ -70,7 +70,7 @@ export default { return; } - if (this.shouldUseGraphQL || this.isEpicBoard) { + if (this.shouldUseGraphQL) { this.createList({ labelId: this.selectedId }); } else { const listObj = { @@ -118,13 +118,17 @@ export default {