From 0f5dcf55e543e2cb30697d4c8ea8ce509cf25375 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 12 Sep 2020 00:08:44 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/docs.gitlab-ci.yml | 1 - .../behaviors/shortcuts/shortcuts.js | 92 ++++++++++++++++ .../groups/members/components/app.vue | 26 +++++ .../javascripts/groups/members/index.js | 32 ++++++ .../javascripts/lib/utils/text_markdown.js | 44 +++++--- .../pages/groups/group_members/index.js | 6 ++ .../components/states/work_in_progress.vue | 8 +- .../mr_widget_options.vue | 21 ++-- .../queries/get_state.query.graphql | 22 +++- .../stores/mr_widget_store.js | 53 ++++++--- .../vue_shared/components/markdown/header.vue | 33 +++++- .../components/markdown/toolbar_button.vue | 21 ++++ .../merge_request_pipelines_resolver.rb | 2 + app/graphql/types/merge_request_type.rb | 7 +- .../types/permission_types/merge_request.rb | 4 + app/helpers/groups/group_members_helper.rb | 79 ++++++++++++++ app/serializers/group_group_link_entity.rb | 26 +++++ .../group_group_link_serializer.rb | 5 + .../groups/group_members/index.html.haml | 36 +++++-- .../shared/blob/_markdown_buttons.html.haml | 18 +++- .../nfriend-add-markdown-editor-shortcuts.yml | 5 + .../development/vue_group_members_list.yml | 7 ++ .../graphql/reference/gitlab_schema.graphql | 17 ++- doc/api/graphql/reference/gitlab_schema.json | 64 +++++++++-- doc/api/graphql/reference/index.md | 3 + doc/ci/yaml/README.md | 2 +- .../application_security/cve_id_request.md | 69 ++++++++++++ .../img/cve_id_request_button.png | Bin 0 -> 5220 bytes .../img/cve_request_communication.png | Bin 0 -> 45402 bytes .../cve_request_communication_publication.png | Bin 0 -> 66617 bytes .../img/new_cve_request_issue.png | Bin 0 -> 96795 bytes doc/user/application_security/index.md | 4 +- doc/user/permissions.md | 1 + doc/user/project/index.md | 2 + .../settings/img/cve_id_request_toggle.png | Bin 0 -> 5395 bytes doc/user/project/settings/index.md | 10 ++ doc/user/shortcuts.md | 7 ++ haml_lint/linter/documentation_links.rb | 3 +- lib/gitlab/utils/markdown.rb | 2 +- locale/gitlab.pot | 21 ++++ spec/features/admin/admin_groups_spec.rb | 2 + .../groups/members/filter_members_spec.rb | 2 + .../groups/members/leave_group_spec.rb | 2 + .../groups/members/list_members_spec.rb | 2 + .../groups/members/manage_groups_spec.rb | 2 + .../groups/members/manage_members_spec.rb | 2 + ...r_adds_member_with_expiration_date_spec.rb | 2 + .../master_manages_access_requests_spec.rb | 4 + .../groups/members/search_members_spec.rb | 2 + .../groups/members/sort_members_spec.rb | 2 + .../markdown/keyboard_shortcuts_spec.rb | 101 ++++++++++++++++++ .../schemas/entities/group_group_link.json | 29 +++++ .../api/schemas/group_group_links.json | 6 ++ spec/fixtures/api/schemas/group_member.json | 78 ++++++++++++++ spec/fixtures/api/schemas/group_members.json | 6 ++ .../pages/design/index_spec.js | 4 - .../frontend/design_management/router_spec.js | 5 - spec/frontend/groups/members/index_spec.js | 58 ++++++++++ spec/frontend/groups/members/mock_data.js | 33 ++++++ spec/frontend/shortcuts_spec.js | 89 +++++++++++++-- .../components/markdown/header_spec.js | 56 +++++++--- .../markdown/toolbar_button_spec.js | 47 ++++++++ .../merge_request_pipelines_resolver_spec.rb | 7 ++ spec/graphql/types/merge_request_type_spec.rb | 1 + .../permission_types/merge_request_spec.rb | 3 +- .../linter/documentation_links_spec.rb | 7 -- .../groups/group_members_helper_spec.rb | 48 +++++++++ spec/lib/gitlab/utils/markdown_spec.rb | 16 +++ .../api/graphql/project/merge_request_spec.rb | 3 +- .../group_group_link_entity_spec.rb | 13 +++ .../group_group_link_serializer_spec.rb | 13 +++ spec/spec_helper.rb | 4 + .../group_group_link_shared_context.rb | 17 +++ 73 files changed, 1301 insertions(+), 118 deletions(-) create mode 100644 app/assets/javascripts/groups/members/components/app.vue create mode 100644 app/assets/javascripts/groups/members/index.js create mode 100644 app/serializers/group_group_link_entity.rb create mode 100644 app/serializers/group_group_link_serializer.rb create mode 100644 changelogs/unreleased/nfriend-add-markdown-editor-shortcuts.yml create mode 100644 config/feature_flags/development/vue_group_members_list.yml create mode 100644 doc/user/application_security/cve_id_request.md create mode 100644 doc/user/application_security/img/cve_id_request_button.png create mode 100644 doc/user/application_security/img/cve_request_communication.png create mode 100644 doc/user/application_security/img/cve_request_communication_publication.png create mode 100644 doc/user/application_security/img/new_cve_request_issue.png create mode 100644 doc/user/project/settings/img/cve_id_request_toggle.png create mode 100644 spec/features/markdown/keyboard_shortcuts_spec.rb create mode 100644 spec/fixtures/api/schemas/entities/group_group_link.json create mode 100644 spec/fixtures/api/schemas/group_group_links.json create mode 100644 spec/fixtures/api/schemas/group_member.json create mode 100644 spec/fixtures/api/schemas/group_members.json create mode 100644 spec/frontend/groups/members/index_spec.js create mode 100644 spec/frontend/groups/members/mock_data.js create mode 100644 spec/frontend/vue_shared/components/markdown/toolbar_button_spec.js create mode 100644 spec/serializers/group_group_link_entity_spec.rb create mode 100644 spec/serializers/group_group_link_serializer_spec.rb create mode 100644 spec/support/shared_contexts/serializers/group_group_link_shared_context.rb diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index 3f8557366c6..0e0e156a64f 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -45,7 +45,6 @@ docs lint: image: "registry.gitlab.com/gitlab-org/gitlab-docs/lint:vale-2.3.4-markdownlint-0.23.2" stage: test needs: [] - allow_failure: true script: - scripts/lint-doc.sh # Prepare docs for build diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js index f820396d05b..8a8b61a57cd 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js @@ -2,6 +2,7 @@ import $ from 'jquery'; import Cookies from 'js-cookie'; import Mousetrap from 'mousetrap'; import Vue from 'vue'; +import { flatten } from 'lodash'; import { disableShortcuts, shouldDisableShortcuts } from './shortcuts_toggle'; import ShortcutsToggle from './shortcuts_toggle.vue'; import axios from '../../lib/utils/axios_utils'; @@ -27,6 +28,39 @@ function initToggleButton() { }); } +/** + * The key used to save and fetch the local Mousetrap instance + * attached to a `