From 1785d4e4aa1834e39c6d46527076d0f9054e329f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 29 Apr 2021 21:10:03 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../components/board_content_sidebar.vue | 10 +- .../javascripts/boards/stores/actions.js | 9 + .../create_merge_request_dropdown.js | 2 +- .../cycle_analytics/components/base.vue | 1 + .../fields/description_template.vue | 1 + app/assets/javascripts/notes.js | 2 +- .../notes/components/note_actions.vue | 2 + .../javascripts/pages/users/user_tabs.js | 4 +- .../components/graph/job_group_dropdown.vue | 1 + .../components/dropdown/dropdown_button.vue | 1 + .../sidebar/labels_select/dropdown_button.vue | 1 + app/assets/stylesheets/framework/buttons.scss | 2 +- .../stylesheets/framework/dropdowns.scss | 2 +- .../stylesheets/framework/editor-lite.scss | 2 +- app/assets/stylesheets/framework/spinner.scss | 49 +--- .../page_bundles/_pipeline_mixins.scss | 2 +- .../stylesheets/page_bundles/pipeline.scss | 2 +- .../concerns/accepts_pending_invitations.rb | 9 +- app/controllers/invites_controller.rb | 27 +- app/controllers/registrations_controller.rb | 14 + .../members/invite_email_experiment.rb | 4 + app/graphql/mutations/labels/create.rb | 7 +- app/graphql/types/base_argument.rb | 3 +- app/graphql/types/base_field.rb | 3 +- .../application_settings/_usage.html.haml | 2 +- app/views/clusters/clusters/_banner.html.haml | 2 +- app/views/dashboard/_activities.html.haml | 2 +- app/views/dashboard/groups/_groups.html.haml | 2 +- app/views/dashboard/todos/_todo.html.haml | 6 +- app/views/dashboard/todos/index.html.haml | 4 +- app/views/explore/groups/_groups.html.haml | 2 +- app/views/groups/_activities.html.haml | 2 +- app/views/groups/_archived_projects.html.haml | 2 +- app/views/groups/_shared_projects.html.haml | 2 +- .../groups/_subgroups_and_projects.html.haml | 2 +- .../groups/group_members/index.html.haml | 8 +- app/views/groups/imports/show.html.haml | 2 +- app/views/ide/_show.html.haml | 2 +- app/views/projects/_activity.html.haml | 2 +- app/views/projects/blob/_upload.html.haml | 2 +- .../projects/commit/_commit_box.html.haml | 4 +- app/views/projects/diffs/_diffs.html.haml | 2 +- app/views/projects/edit.html.haml | 2 +- .../projects/issues/_new_branch.html.haml | 4 +- .../creations/_new_compare.html.haml | 4 +- .../creations/_new_submit.html.haml | 2 +- .../projects/merge_requests/show.html.haml | 2 +- .../projects/mirrors/_ssh_host_keys.html.haml | 2 +- app/views/projects/network/show.html.haml | 2 +- app/views/projects/new.html.haml | 2 +- .../projects/project_members/index.html.haml | 8 +- .../milestones/_delete_button.html.haml | 2 +- .../shared/milestones/_tab_loading.html.haml | 2 +- app/views/users/_overview.html.haml | 6 +- app/views/users/show.html.haml | 4 +- .../ajk-graphql-docs-see-doc-ref.yml | 5 + .../spinner-space-admin-payload-btn.yml | 5 + .../load_balancing_atomic_replica.yml | 4 +- doc/api/graphql/reference/index.md | 240 +++++++++--------- doc/user/packages/container_registry/index.md | 80 +++++- lib/gitlab/graphql/docs/helper.rb | 30 ++- locale/gitlab.pot | 3 + package.json | 2 +- spec/controllers/invites_controller_spec.rb | 105 ++++---- .../registrations_controller_spec.rb | 40 ++- .../members/invite_email_experiment_spec.rb | 10 + spec/features/invites_spec.rb | 31 ++- spec/features/projects/commit/builds_spec.rb | 2 +- spec/frontend/boards/stores/actions_spec.js | 27 ++ .../create_merge_request_dropdown_spec.js | 2 +- spec/lib/gitlab/graphql/docs/renderer_spec.rb | 63 +++++ .../features/sidebar_shared_examples.rb | 19 ++ yarn.lock | 8 +- 73 files changed, 612 insertions(+), 316 deletions(-) create mode 100644 changelogs/unreleased/ajk-graphql-docs-see-doc-ref.yml create mode 100644 changelogs/unreleased/spinner-space-admin-payload-btn.yml diff --git a/app/assets/javascripts/boards/components/board_content_sidebar.vue b/app/assets/javascripts/boards/components/board_content_sidebar.vue index 46359cc2bca..0050d64235f 100644 --- a/app/assets/javascripts/boards/components/board_content_sidebar.vue +++ b/app/assets/javascripts/boards/components/board_content_sidebar.vue @@ -10,6 +10,7 @@ import BoardSidebarTitle from '~/boards/components/sidebar/board_sidebar_title.v import { ISSUABLE } from '~/boards/constants'; import { contentTop } from '~/lib/utils/common_utils'; import SidebarAssigneesWidget from '~/sidebar/components/assignees/sidebar_assignees_widget.vue'; +import SidebarConfidentialityWidget from '~/sidebar/components/confidential/sidebar_confidentiality_widget.vue'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; export default { @@ -18,6 +19,7 @@ export default { GlDrawer, BoardSidebarTitle, SidebarAssigneesWidget, + SidebarConfidentialityWidget, BoardSidebarTimeTracker, BoardSidebarLabelsSelect, BoardSidebarDueDate, @@ -50,7 +52,7 @@ export default { }, }, methods: { - ...mapActions(['toggleBoardItem', 'setAssignees']), + ...mapActions(['toggleBoardItem', 'setAssignees', 'setActiveItemConfidential']), handleClose() { this.toggleBoardItem({ boardItem: this.activeBoardItem, sidebarType: this.sidebarType }); }, @@ -90,6 +92,12 @@ export default { + diff --git a/app/assets/javascripts/boards/stores/actions.js b/app/assets/javascripts/boards/stores/actions.js index de634e844dc..27dccd91b40 100644 --- a/app/assets/javascripts/boards/stores/actions.js +++ b/app/assets/javascripts/boards/stores/actions.js @@ -652,6 +652,15 @@ export default { }); }, + setActiveItemConfidential: ({ commit, getters }, confidential) => { + const { activeBoardItem } = getters; + commit(types.UPDATE_BOARD_ITEM_BY_ID, { + itemId: activeBoardItem.id, + prop: 'confidential', + value: confidential, + }); + }, + fetchGroupProjects: ({ commit, state }, { search = '', fetchNext = false }) => { commit(types.REQUEST_GROUP_PROJECTS, fetchNext); diff --git a/app/assets/javascripts/create_merge_request_dropdown.js b/app/assets/javascripts/create_merge_request_dropdown.js index 000faacb7d7..1c0dab11392 100644 --- a/app/assets/javascripts/create_merge_request_dropdown.js +++ b/app/assets/javascripts/create_merge_request_dropdown.js @@ -42,7 +42,7 @@ export default class CreateMergeRequestDropdown { this.refInput = this.wrapperEl.querySelector('.js-ref'); this.refMessage = this.wrapperEl.querySelector('.js-ref-message'); this.unavailableButton = this.wrapperEl.querySelector('.unavailable'); - this.unavailableButtonSpinner = this.unavailableButton.querySelector('.spinner'); + this.unavailableButtonSpinner = this.unavailableButton.querySelector('.gl-spinner'); this.unavailableButtonText = this.unavailableButton.querySelector('.text'); this.branchCreated = false; diff --git a/app/assets/javascripts/cycle_analytics/components/base.vue b/app/assets/javascripts/cycle_analytics/components/base.vue index 32c4e0ec192..11a263015e4 100644 --- a/app/assets/javascripts/cycle_analytics/components/base.vue +++ b/app/assets/javascripts/cycle_analytics/components/base.vue @@ -117,6 +117,7 @@ export default {