From 7f08e6916d8259a8ed1549cb54460f0b746d9d8b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 15 Mar 2022 18:08:10 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- GITALY_SERVER_VERSION | 2 +- Gemfile | 4 +- Gemfile.lock | 12 +- .../components/new_environment_folder.vue | 4 +- .../components/new_environments_app.vue | 18 +- .../javascripts/environments/constants.js | 10 + .../members_filtered_search_bar.vue | 41 +- app/assets/javascripts/members/constants.js | 37 +- app/assets/javascripts/members/index.js | 2 + .../pages/groups/group_members/index.js | 2 +- .../components/learn_gitlab_section_link.vue | 4 +- .../projects/learn_gitlab/constants/index.js | 1 - app/assets/stylesheets/framework/mixins.scss | 6 + app/assets/stylesheets/notify.scss | 24 +- app/assets/stylesheets/notify_base.scss | 25 + app/assets/stylesheets/notify_enhanced.scss | 68 +++ .../projects/environments_controller.rb | 12 +- .../projects/redirect_controller.rb | 20 + app/controllers/projects_controller.rb | 18 +- .../concerns/group_issuable_resolver.rb | 23 +- .../resolvers/group_issues_resolver.rb | 6 +- .../group_merge_requests_resolver.rb | 5 +- app/helpers/learn_gitlab_helper.rb | 38 +- app/models/project.rb | 4 - app/views/layouts/notify.html.haml | 5 +- app/views/layouts/service_desk.html.haml | 5 +- app/views/notify/_note_email.html.haml | 4 +- app/views/notify/issue_due_email.html.haml | 4 +- app/views/notify/new_issue_email.html.haml | 4 +- .../notify/new_merge_request_email.html.haml | 2 +- app/views/notify/new_release_email.html.haml | 2 +- .../service_desk_new_note_email.html.haml | 2 +- config/application.rb | 1 + ...ialization.yml => enhanced_notify_css.yml} | 8 +- ...change_continuous_onboarding_link_urls.yml | 8 - config/routes.rb | 2 +- doc/.vale/gitlab/HeadingContent.yml | 18 + doc/administration/geo/index.md | 2 +- doc/api/graphql/reference/index.md | 2 + doc/api/group_labels.md | 2 +- doc/api/issues.md | 22 + doc/development/documentation/index.md | 20 +- doc/development/service_ping/index.md | 5 +- .../cluster_image_scanning/index.md | 2 +- .../container_scanning/index.md | 2 +- doc/user/group/index.md | 1 + .../img/labels_sort_label_priority.png | Bin 42263 -> 0 bytes doc/user/project/img/labels_sort_priority.png | Bin 41486 -> 0 bytes .../img/labels_subscriptions_v13_5.png | Bin 11375 -> 0 bytes doc/user/project/issue_board.md | 2 +- .../project/issues/sorting_issue_lists.md | 6 +- doc/user/project/labels.md | 453 ++++++++++++------ doc/user/search/index.md | 2 +- lib/backup/manager.rb | 59 ++- lib/gitlab/ci/config/entry/reports.rb | 16 +- .../config/entry/reports/coverage_report.rb | 31 ++ lib/gitlab/config/entry/validators.rb | 11 + lib/learn_gitlab/onboarding.rb | 16 +- scripts/merge-simplecov | 24 +- spec/controllers/projects_controller_spec.rb | 53 -- .../environments/new_environments_app_spec.js | 18 +- .../members_filtered_search_bar_spec.js | 54 +-- .../__snapshots__/learn_gitlab_spec.js.snap | 14 - .../learn_gitlab_section_link_spec.js | 8 +- .../learn_gitlab/components/mock_data.js | 1 + spec/graphql/resolvers/base_resolver_spec.rb | 10 +- .../concerns/resolves_pipelines_spec.rb | 6 +- .../graphql/resolvers/issues_resolver_spec.rb | 4 +- .../namespace_projects_resolver_spec.rb | 4 +- .../resolvers/project_resolver_spec.rb | 4 +- spec/graphql/types/base_enum_spec.rb | 2 +- spec/graphql/types/base_field_spec.rb | 28 +- spec/graphql/types/global_id_type_spec.rb | 8 +- spec/helpers/learn_gitlab_helper_spec.rb | 79 +-- spec/lib/backup/manager_spec.rb | 8 +- .../entry/reports/coverage_report_spec.rb | 57 +++ .../gitlab/ci/config/entry/reports_spec.rb | 47 +- .../gitlab/config/entry/validators_spec.rb | 43 ++ .../lib/gitlab/graphql/markdown_field_spec.rb | 12 +- .../lib/gitlab/graphql/mount_mutation_spec.rb | 8 +- spec/lib/learn_gitlab/onboarding_spec.rb | 2 +- spec/models/project_spec.rb | 8 - .../requests/api/graphql/group/issues_spec.rb | 25 + .../api/graphql/group/merge_requests_spec.rb | 21 + .../projects/redirect_controller_spec.rb | 66 +++ spec/routing/project_routing_spec.rb | 6 +- .../create_pipeline_service/artifacts_spec.rb | 67 +++ spec/services/notification_service_spec.rb | 1 + 88 files changed, 1165 insertions(+), 628 deletions(-) create mode 100644 app/assets/stylesheets/notify_base.scss create mode 100644 app/assets/stylesheets/notify_enhanced.scss create mode 100644 app/controllers/projects/redirect_controller.rb rename config/feature_flags/development/{block_project_serialization.yml => enhanced_notify_css.yml} (58%) delete mode 100644 config/feature_flags/experiment/change_continuous_onboarding_link_urls.yml create mode 100644 doc/.vale/gitlab/HeadingContent.yml delete mode 100644 doc/user/project/img/labels_sort_label_priority.png delete mode 100644 doc/user/project/img/labels_sort_priority.png delete mode 100644 doc/user/project/img/labels_subscriptions_v13_5.png create mode 100644 lib/gitlab/ci/config/entry/reports/coverage_report.rb create mode 100644 spec/lib/gitlab/ci/config/entry/reports/coverage_report_spec.rb create mode 100644 spec/lib/gitlab/config/entry/validators_spec.rb create mode 100644 spec/requests/projects/redirect_controller_spec.rb create mode 100644 spec/services/ci/create_pipeline_service/artifacts_spec.rb diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 804e2152697..200d09d4331 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -d0d5fa790767c12eeadb40a1ecfbc00fde2a4768 +4ef97df05e54269d90fdbd4d2f59fcc29b1afcdf diff --git a/Gemfile b/Gemfile index 5e7b3738185..66b2ad17397 100644 --- a/Gemfile +++ b/Gemfile @@ -153,7 +153,7 @@ gem 'html-pipeline', '~> 2.13.2' gem 'deckar01-task_list', '2.3.1' gem 'gitlab-markup', '~> 1.8.0' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'commonmarker', '~> 0.23.2' +gem 'commonmarker', '~> 0.23.4' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.3.2' @@ -405,7 +405,7 @@ group :development, :test, :danger do end group :development, :test, :coverage do - gem 'simplecov', '~> 0.18.5', require: false + gem 'simplecov', '~> 0.21', require: false gem 'simplecov-lcov', '~> 0.8.0', require: false gem 'simplecov-cobertura', '~> 1.3.1', require: false gem 'undercover', '~> 0.4.4', require: false diff --git a/Gemfile.lock b/Gemfile.lock index d2e2d1e6438..00d16ddbfd5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -202,7 +202,7 @@ GEM open4 (~> 1.3) coderay (1.1.3) colored2 (3.1.2) - commonmarker (0.23.2) + commonmarker (0.23.4) concurrent-ruby (1.1.9) connection_pool (2.2.5) contracts (0.11.0) @@ -281,7 +281,7 @@ GEM diffy (3.3.0) discordrb-webhooks (3.4.2) rest-client (>= 2.0.0) - docile (1.3.2) + docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) doorkeeper (5.5.0.rc2) @@ -1207,13 +1207,15 @@ GEM jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simple_po_parser (1.1.2) - simplecov (0.18.5) + simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-cobertura (1.3.1) simplecov (~> 0.8) simplecov-html (0.12.3) simplecov-lcov (0.8.0) + simplecov_json_formatter (0.1.4) sixarm_ruby_unaccent (1.2.0) slack-messenger (2.3.4) snowplow-tracker (0.6.1) @@ -1438,7 +1440,7 @@ DEPENDENCIES capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) - commonmarker (~> 0.23.2) + commonmarker (~> 0.23.4) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 3.0) @@ -1648,7 +1650,7 @@ DEPENDENCIES sidekiq-cron (~> 1.2) sigdump (~> 0.2.4) simple_po_parser (~> 1.1.2) - simplecov (~> 0.18.5) + simplecov (~> 0.21) simplecov-cobertura (~> 1.3.1) simplecov-lcov (~> 0.8.0) slack-messenger (~> 2.3.4) diff --git a/app/assets/javascripts/environments/components/new_environment_folder.vue b/app/assets/javascripts/environments/components/new_environment_folder.vue index 30a178db5cc..d5c6d26cfd0 100644 --- a/app/assets/javascripts/environments/components/new_environment_folder.vue +++ b/app/assets/javascripts/environments/components/new_environment_folder.vue @@ -3,6 +3,7 @@ import { GlButton, GlCollapse, GlIcon, GlBadge, GlLink } from '@gitlab/ui'; import { __, s__ } from '~/locale'; import pollIntervalQuery from '../graphql/queries/poll_interval.query.graphql'; import folderQuery from '../graphql/queries/folder.query.graphql'; +import { ENVIRONMENT_COUNT_BY_SCOPE } from '../constants'; import EnvironmentItem from './new_environment_item.vue'; export default { @@ -56,7 +57,8 @@ export default { return this.visible ? this.$options.i18n.collapse : this.$options.i18n.expand; }, count() { - return this.folder?.[`${this.scope}Count`] ?? 0; + const count = ENVIRONMENT_COUNT_BY_SCOPE[this.scope]; + return this.folder?.[count] ?? 0; }, folderClass() { return { 'gl-font-weight-bold': this.visible }; diff --git a/app/assets/javascripts/environments/components/new_environments_app.vue b/app/assets/javascripts/environments/components/new_environments_app.vue index 8e6457ed918..087e9cd2fcd 100644 --- a/app/assets/javascripts/environments/components/new_environments_app.vue +++ b/app/assets/javascripts/environments/components/new_environments_app.vue @@ -9,6 +9,7 @@ import environmentToDeleteQuery from '../graphql/queries/environment_to_delete.q import environmentToRollbackQuery from '../graphql/queries/environment_to_rollback.query.graphql'; import environmentToStopQuery from '../graphql/queries/environment_to_stop.query.graphql'; import environmentToChangeCanaryQuery from '../graphql/queries/environment_to_change_canary.query.graphql'; +import { ENVIRONMENTS_SCOPE } from '../constants'; import EnvironmentFolder from './new_environment_folder.vue'; import EnableReviewAppModal from './enable_review_app_modal.vue'; import StopEnvironmentModal from './stop_environment_modal.vue'; @@ -82,12 +83,14 @@ export default { }, modalId: 'enable-review-app-info', data() { - const { page = '1', scope = 'available' } = queryToObject(window.location.search); + const { page = '1', scope } = queryToObject(window.location.search); return { interval: undefined, isReviewAppModalVisible: false, page: parseInt(page, 10), - scope, + scope: Object.values(ENVIRONMENTS_SCOPE).includes(scope) + ? scope + : ENVIRONMENTS_SCOPE.AVAILABLE, environmentToDelete: {}, environmentToRollback: {}, environmentToStop: {}, @@ -188,6 +191,7 @@ export default { }); }, }, + ENVIRONMENTS_SCOPE, };