From e3042fc5ced749e693ccef81b3f5838c55d5480c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 11 May 2021 15:10:20 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- GITALY_SERVER_VERSION | 2 +- .../javascripts/emoji/components/picker.vue | 1 + .../edit/components/jira_trigger_fields.vue | 6 +- .../notes/components/note_actions.vue | 9 +- .../components/note_actions/reply_button.vue | 1 - .../drawer/cards/first_pipeline_card.vue | 67 +++++++ .../drawer/cards/getting_started_card.vue | 35 ++++ .../cards/pipeline_config_reference_card.vue | 75 ++++++++ .../drawer/cards/visualize_and_lint_card.vue | 24 +++ .../drawer/pipeline_editor_drawer.vue | 25 ++- .../components/drawer/ui/demo_job_pill.vue | 17 ++ .../drawer/ui/pipeline_visual_reference.vue | 43 +++++ .../javascripts/pipeline_editor/index.js | 14 +- .../details_page/details_header.vue | 58 +++--- ...container_repository_details.query.graphql | 1 - ...et_container_repository_tags.query.graphql | 2 +- ...tainer_repository_tags_count.query.graphql | 6 + .../registry/explorer/pages/details.vue | 29 ++- .../deployment/deployment_view_button.vue | 19 +- .../stylesheets/framework/timeline.scss | 6 + app/assets/stylesheets/pages/notes.scss | 1 + app/controllers/concerns/boards_actions.rb | 6 +- .../groups/group_members_controller.rb | 11 +- .../concerns/packages/finder_helper.rb | 6 +- .../packages/composer/packages_finder.rb | 2 +- app/finders/packages/conan/package_finder.rb | 2 +- .../packages/generic/package_finder.rb | 1 + app/finders/packages/go/package_finder.rb | 1 + app/finders/packages/group_packages_finder.rb | 4 +- app/finders/packages/maven/package_finder.rb | 21 +-- app/finders/packages/npm/package_finder.rb | 1 + app/finders/packages/nuget/package_finder.rb | 2 +- app/finders/packages/package_finder.rb | 1 + .../queries/epic/epic_children.query.graphql | 4 + app/helpers/ci/pipeline_editor_helper.rb | 5 + app/models/board_group_recent_visit.rb | 20 +- app/models/board_project_recent_visit.rb | 20 +- app/models/bulk_imports/entity.rb | 4 + app/models/concerns/board_recent_visit.rb | 34 ++++ app/models/packages/package.rb | 2 + app/models/project_services/jira_service.rb | 5 +- app/services/boards/visits/create_service.rb | 16 +- app/services/packages/nuget/search_service.rb | 1 + .../groups/group_members/index.html.haml | 13 +- app/workers/all_queues.yml | 9 + app/workers/bulk_import_worker.rb | 1 + .../bulk_imports/export_request_worker.rb | 33 ++++ .../321625-epic_boards-redirect.yml | 5 + ...-set-traversal_ids-for-every-namespace.yml | 5 + .../unreleased/326229-package-displayable.yml | 5 + ...ew-queries-found-in-groupmembers-index.yml | 5 + ...eorgekoltsov-add-export-request-worker.yml | 5 + .../unreleased/jira-form-copy-updates.yml | 5 + .../make-comment-actions-larger.yml | 5 + .../unreleased/review-app-button-styles.yml | 6 + config/sidekiq_queues.yml | 2 + ...4929_add_epic_board_recent_visits_table.rb | 24 +++ ...0_add_index_to_epic_board_recent_visits.rb | 20 ++ ...6065000_schedule_backfill_traversal_ids.rb | 38 ++++ db/schema_migrations/20210506065000 | 1 + db/schema_migrations/20210511104929 | 1 + db/schema_migrations/20210511104930 | 1 + db/structure.sql | 40 ++++ doc/api/members.md | 9 +- lib/banzai/cross_project_reference.rb | 7 +- .../references/abstract_reference_filter.rb | 141 ++------------ .../references/commit_reference_filter.rb | 8 +- .../references/design_reference_filter.rb | 11 +- .../references/issuable_reference_filter.rb | 6 +- .../references/label_reference_filter.rb | 4 +- .../references/milestone_reference_filter.rb | 2 +- .../filter/references/reference_cache.rb | 178 ++++++++++++++++++ .../filter/references/reference_filter.rb | 24 +-- lib/bulk_imports/clients/http.rb | 11 ++ ...ckfill_namespace_traversal_ids_children.rb | 76 ++++++++ .../backfill_namespace_traversal_ids_roots.rb | 42 +++++ locale/gitlab.pot | 84 ++++++++- .../groups/group_members_controller_spec.rb | 15 +- .../concerns/packages/finder_helper_spec.rb | 25 +++ .../packages/composer/packages_finder_spec.rb | 25 +++ .../packages/conan/package_finder_spec.rb | 3 +- .../packages/generic/package_finder_spec.rb | 7 + .../packages/go/package_finder_spec.rb | 13 +- .../packages/maven/package_finder_spec.rb | 12 +- .../packages/npm/package_finder_spec.rb | 10 +- .../packages/nuget/package_finder_spec.rb | 10 +- spec/finders/packages/package_finder_spec.rb | 12 +- .../drawer/cards/first_pipeline_card_spec.js | 47 +++++ .../drawer/cards/getting_started_card_spec.js | 26 +++ .../pipeline_config_reference_card_spec.js | 51 +++++ .../cards/visualize_and_lint_card_spec.js | 26 +++ .../drawer/pipeline_editor_drawer_spec.js | 25 ++- .../drawer/ui/demo_job_pill_spec.js | 27 +++ .../ui/pipeline_visual_reference_spec.js | 31 +++ .../details_page/details_header_spec.js | 105 ++++++++--- spec/frontend/registry/explorer/mock_data.js | 11 +- .../registry/explorer/pages/details_spec.js | 1 - .../deployment/deployment_view_button_spec.js | 40 ++-- .../helpers/ci/pipeline_editor_helper_spec.rb | 10 + .../banzai/cross_project_reference_spec.rb | 15 ++ .../abstract_reference_filter_spec.rb | 80 -------- .../references/issue_reference_filter_spec.rb | 18 -- .../filter/references/reference_cache_spec.rb | 143 ++++++++++++++ spec/lib/bulk_imports/clients/http_spec.rb | 102 +++++----- ...l_namespace_traversal_ids_children_spec.rb | 21 +++ ...fill_namespace_traversal_ids_roots_spec.rb | 21 +++ spec/models/board_group_recent_visit_spec.rb | 60 +----- .../models/board_project_recent_visit_spec.rb | 60 +----- spec/models/bulk_imports/entity_spec.rb | 9 + spec/models/packages/package_spec.rb | 34 ++-- .../boards/visits/create_service_spec.rb | 43 +---- .../packages/nuget/search_service_spec.rb | 12 +- .../finders/packages_shared_examples.rb | 4 +- .../boards_recent_visit_shared_examples.rb | 65 +++++++ .../boards/create_service_shared_examples.rb | 25 +++ spec/workers/bulk_import_worker_spec.rb | 3 +- .../export_request_worker_spec.rb | 30 +++ 117 files changed, 2043 insertions(+), 671 deletions(-) create mode 100644 app/assets/javascripts/pipeline_editor/components/drawer/cards/first_pipeline_card.vue create mode 100644 app/assets/javascripts/pipeline_editor/components/drawer/cards/getting_started_card.vue create mode 100644 app/assets/javascripts/pipeline_editor/components/drawer/cards/pipeline_config_reference_card.vue create mode 100644 app/assets/javascripts/pipeline_editor/components/drawer/cards/visualize_and_lint_card.vue create mode 100644 app/assets/javascripts/pipeline_editor/components/drawer/ui/demo_job_pill.vue create mode 100644 app/assets/javascripts/pipeline_editor/components/drawer/ui/pipeline_visual_reference.vue create mode 100644 app/assets/javascripts/registry/explorer/graphql/queries/get_container_repository_tags_count.query.graphql create mode 100644 app/models/concerns/board_recent_visit.rb create mode 100644 app/workers/bulk_imports/export_request_worker.rb create mode 100644 changelogs/unreleased/321625-epic_boards-redirect.yml create mode 100644 changelogs/unreleased/325508-set-traversal_ids-for-every-namespace.yml create mode 100644 changelogs/unreleased/326229-package-displayable.yml create mode 100644 changelogs/unreleased/329778-fine-tune-a-few-queries-found-in-groupmembers-index.yml create mode 100644 changelogs/unreleased/georgekoltsov-add-export-request-worker.yml create mode 100644 changelogs/unreleased/jira-form-copy-updates.yml create mode 100644 changelogs/unreleased/make-comment-actions-larger.yml create mode 100644 changelogs/unreleased/review-app-button-styles.yml create mode 100644 db/migrate/20210511104929_add_epic_board_recent_visits_table.rb create mode 100644 db/migrate/20210511104930_add_index_to_epic_board_recent_visits.rb create mode 100644 db/post_migrate/20210506065000_schedule_backfill_traversal_ids.rb create mode 100644 db/schema_migrations/20210506065000 create mode 100644 db/schema_migrations/20210511104929 create mode 100644 db/schema_migrations/20210511104930 create mode 100644 lib/banzai/filter/references/reference_cache.rb create mode 100644 lib/gitlab/background_migration/backfill_namespace_traversal_ids_children.rb create mode 100644 lib/gitlab/background_migration/backfill_namespace_traversal_ids_roots.rb create mode 100644 spec/finders/packages/composer/packages_finder_spec.rb create mode 100644 spec/frontend/pipeline_editor/components/drawer/cards/first_pipeline_card_spec.js create mode 100644 spec/frontend/pipeline_editor/components/drawer/cards/getting_started_card_spec.js create mode 100644 spec/frontend/pipeline_editor/components/drawer/cards/pipeline_config_reference_card_spec.js create mode 100644 spec/frontend/pipeline_editor/components/drawer/cards/visualize_and_lint_card_spec.js create mode 100644 spec/frontend/pipeline_editor/components/drawer/ui/demo_job_pill_spec.js create mode 100644 spec/frontend/pipeline_editor/components/drawer/ui/pipeline_visual_reference_spec.js create mode 100644 spec/lib/banzai/filter/references/reference_cache_spec.rb create mode 100644 spec/lib/gitlab/background_migration/backfill_namespace_traversal_ids_children_spec.rb create mode 100644 spec/lib/gitlab/background_migration/backfill_namespace_traversal_ids_roots_spec.rb create mode 100644 spec/support/shared_examples/services/boards/boards_recent_visit_shared_examples.rb create mode 100644 spec/support/shared_examples/services/boards/create_service_shared_examples.rb create mode 100644 spec/workers/bulk_imports/export_request_worker_spec.rb diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 5f653fbfc26..0bf6709a0ba 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -4f0cd9404f31511f5051e49b363adc06aa3ec365 +30ae36f781ee979330b1f170d81c97c319c2fff1 diff --git a/app/assets/javascripts/emoji/components/picker.vue b/app/assets/javascripts/emoji/components/picker.vue index 71cabe80529..e08d294b8c5 100644 --- a/app/assets/javascripts/emoji/components/picker.vue +++ b/app/assets/javascripts/emoji/components/picker.vue @@ -79,6 +79,7 @@ export default { :toggle-class="toggleClass" :boundary="getBoundaryElement()" menu-class="dropdown-extended-height" + category="tertiary" no-flip right lazy diff --git a/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue b/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue index b0f19e5b585..93d8bcc4c19 100644 --- a/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue +++ b/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue @@ -16,13 +16,13 @@ const commentDetailOptions = [ { value: 'standard', label: s__('Integrations|Standard'), - help: s__('Integrations|Includes commit title and branch'), + help: s__('Integrations|Includes commit title and branch.'), }, { value: 'all_details', label: s__('Integrations|All details'), help: s__( - 'Integrations|Includes Standard plus entire commit message, commit hash, and issue IDs', + 'Integrations|Includes Standard, plus the entire commit message, commit hash, and issue IDs', ), }, ]; @@ -144,7 +144,7 @@ export default { label-for="service[trigger]" :description=" s__( - 'Integrations|When a Jira issue is mentioned in a commit or merge request a remote link and comment (if enabled) is created.', + 'Integrations|When you mention a Jira issue in a commit or merge request, GitLab creates a remote link and comment (if enabled).', ) " > diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue index 16c76e048bd..0cc818c6d0e 100644 --- a/app/assets/javascripts/notes/components/note_actions.vue +++ b/app/assets/javascripts/notes/components/note_actions.vue @@ -278,7 +278,6 @@ export default { v-if="canResolve" ref="resolveButton" v-gl-tooltip - size="small" category="tertiary" :variant="resolveVariant" :class="{ 'is-disabled': !resolvable, 'is-active': isResolved }" @@ -292,7 +291,7 @@ export default {