From 3172281335efddd1078fa6c601f3ba8782f73192 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 11 Dec 2020 18:09:57 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/issue_templates/Feature proposal.md | 2 +- .../issue_templates/Lean Feature Proposal.md | 2 +- .../Snowplow event tracking.md | 2 +- Gemfile | 4 +- Gemfile.lock | 8 +- .../ide/components/pipelines/list.vue | 11 +- .../issue_show/components/header_actions.vue | 21 ++-- .../projects/default_project_templates.js | 4 + .../projects/default_sample_data_templates.js | 12 -- .../javascripts/projects/project_new.js | 4 +- .../page_bundles/oncall_schedules.scss | 89 +++++++++++---- app/controllers/profiles/keys_controller.rb | 21 ---- .../projects/merge_requests_controller.rb | 2 +- app/controllers/users_controller.rb | 6 + app/helpers/icons_helper.rb | 4 +- app/models/user.rb | 1 + app/policies/base_policy.rb | 4 + app/policies/concerns/policy_actor.rb | 4 + app/policies/global_policy.rb | 2 +- app/serializers/pipeline_serializer.rb | 2 + .../projects/_project_templates.html.haml | 10 +- .../shared/integrations/_index.html.haml | 7 +- .../purge_dependency_proxy_cache_worker.rb | 1 + .../unreleased/241639-delete-manifest-api.yml | 5 + .../242026-gl-alert-pipeline-ide.yml | 5 + ...73418-enable-security-report-downloads.yml | 5 + ...e-header-mobile-dropdown-loading-state.yml | 5 + .../unreleased/gy-sample-data-rework.yml | 5 + .../unreleased/integrations-page-cleanup.yml | 5 + .../move-profiles-keys-get-keys-to-users.yml | 5 + .../unreleased/sh-upgrade-mailroom-0-0-8.yml | 5 + ...f_check_with_paths_changed_rpc_flag_on.yml | 5 + .../core_security_mr_widget_downloads.yml | 2 +- .../diff_check_with_paths_changed_rpc.yml | 2 +- config/routes/user.rb | 2 +- doc/api/dependency_proxy.md | 2 +- doc/development/application_secrets.md | 8 +- doc/development/chaos_endpoints.md | 24 ++-- doc/development/contributing/index.md | 2 +- doc/development/contributing/style_guides.md | 26 +++++ doc/development/fe_guide/graphql.md | 52 +++++++++ doc/development/github_importer.md | 44 ++++---- doc/development/import_project.md | 16 +-- .../namespaces_storage_statistics.md | 6 +- doc/development/query_count_limits.md | 8 +- doc/development/service_measurement.md | 6 +- .../img/security_widget_v13_6.png | Bin 3229 -> 0 bytes .../img/security_widget_v13_7.png | Bin 0 -> 3276 bytes doc/user/application_security/index.md | 6 +- .../deploy_tokens/img/deploy_tokens.png | Bin 49460 -> 0 bytes .../deploy_tokens/img/deploy_tokens_ui.png | Bin 0 -> 101571 bytes doc/user/project/deploy_tokens/index.md | 4 +- .../project/settings/project_access_tokens.md | 4 +- doc/user/project/static_site_editor/index.md | 6 +- lib/gitlab/checks/diff_check.rb | 2 +- lib/gitlab/project_template.rb | 38 +++---- lib/gitlab/sample_data_template.rb | 3 +- locale/gitlab.pot | 55 ++++----- qa/qa/page/project/settings/integrations.rb | 4 +- .../profiles/keys_controller_spec.rb | 104 ----------------- spec/controllers/users_controller_spec.rb | 105 ++++++++++++++++++ spec/factories/users.rb | 4 + .../discussion_lock_spec.rb | 0 .../related_issues_spec.rb | 0 spec/features/projects_spec.rb | 2 +- spec/lib/gitlab/sample_data_template_spec.rb | 5 +- spec/policies/global_policy_spec.rb | 20 ++++ spec/routing/routing_spec.rb | 16 +-- spec/support/helpers/test_env.rb | 24 ++++ ...urge_dependency_proxy_cache_worker_spec.rb | 8 +- .../{basic.tar.gz => sample.tar.gz} | Bin .../serenity_valley.tar.gz | Bin 7399896 -> 0 bytes 72 files changed, 538 insertions(+), 340 deletions(-) delete mode 100644 app/assets/javascripts/projects/default_sample_data_templates.js create mode 100644 changelogs/unreleased/241639-delete-manifest-api.yml create mode 100644 changelogs/unreleased/242026-gl-alert-pipeline-ide.yml create mode 100644 changelogs/unreleased/273418-enable-security-report-downloads.yml create mode 100644 changelogs/unreleased/cngo-add-issue-header-mobile-dropdown-loading-state.yml create mode 100644 changelogs/unreleased/gy-sample-data-rework.yml create mode 100644 changelogs/unreleased/integrations-page-cleanup.yml create mode 100644 changelogs/unreleased/move-profiles-keys-get-keys-to-users.yml create mode 100644 changelogs/unreleased/sh-upgrade-mailroom-0-0-8.yml create mode 100644 changelogs/unreleased/switch_diff_check_with_paths_changed_rpc_flag_on.yml delete mode 100644 doc/user/application_security/img/security_widget_v13_6.png create mode 100644 doc/user/application_security/img/security_widget_v13_7.png delete mode 100644 doc/user/project/deploy_tokens/img/deploy_tokens.png create mode 100644 doc/user/project/deploy_tokens/img/deploy_tokens_ui.png rename spec/features/{issuables => issues}/discussion_lock_spec.rb (100%) rename spec/features/{issuables => issues}/related_issues_spec.rb (100%) rename vendor/sample_data_templates/{basic.tar.gz => sample.tar.gz} (100%) delete mode 100644 vendor/sample_data_templates/serenity_valley.tar.gz diff --git a/.gitlab/issue_templates/Feature proposal.md b/.gitlab/issue_templates/Feature proposal.md index 1f8cd81be9d..5ab46bfa26f 100644 --- a/.gitlab/issue_templates/Feature proposal.md +++ b/.gitlab/issue_templates/Feature proposal.md @@ -99,7 +99,7 @@ In which enterprise tier should this feature go? See https://about.gitlab.com/ha /label ~devops:: ~group: ~Category: diff --git a/.gitlab/issue_templates/Lean Feature Proposal.md b/.gitlab/issue_templates/Lean Feature Proposal.md index 4e74073c089..44210a89023 100644 --- a/.gitlab/issue_templates/Lean Feature Proposal.md +++ b/.gitlab/issue_templates/Lean Feature Proposal.md @@ -19,7 +19,7 @@ /label ~devops:: ~group: ~Category: /label ~"snowplow tracking events" diff --git a/Gemfile b/Gemfile index 70aa3cc9932..b404810ff45 100644 --- a/Gemfile +++ b/Gemfile @@ -372,7 +372,7 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 5.2.0', require: false + gem 'gitlab-styles', '~> 5.3.0', require: false gem 'scss_lint', '~> 0.59.0', require: false gem 'haml_lint', '~> 0.36.0', require: false @@ -430,7 +430,7 @@ end gem 'octokit', '~> 4.15' # https://gitlab.com/gitlab-org/gitlab/issues/207207 -gem 'gitlab-mail_room', '~> 0.0.7', require: 'mail_room' +gem 'gitlab-mail_room', '~> 0.0.8', require: 'mail_room' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' diff --git a/Gemfile.lock b/Gemfile.lock index 14d110666b2..3c61f223fa9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -446,7 +446,7 @@ GEM opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) - gitlab-mail_room (0.0.7) + gitlab-mail_room (0.0.8) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) gitlab-pg_query (1.3.0) @@ -457,7 +457,7 @@ GEM gitlab-puma (>= 2.7, < 5) gitlab-sidekiq-fetcher (0.5.2) sidekiq (~> 5) - gitlab-styles (5.2.0) + gitlab-styles (5.3.0) rubocop (~> 0.89.1) rubocop-gitlab-security (~> 0.1.0) rubocop-performance (~> 1.8.1) @@ -1361,14 +1361,14 @@ DEPENDENCIES gitlab-fog-azure-rm (~> 1.0) gitlab-labkit (= 0.13.3) gitlab-license (~> 1.0) - gitlab-mail_room (~> 0.0.7) + gitlab-mail_room (~> 0.0.8) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) gitlab-pg_query (~> 1.3) gitlab-puma (~> 4.3.3.gitlab.2) gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) gitlab-sidekiq-fetcher (= 0.5.2) - gitlab-styles (~> 5.2.0) + gitlab-styles (~> 5.3.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) diff --git a/app/assets/javascripts/ide/components/pipelines/list.vue b/app/assets/javascripts/ide/components/pipelines/list.vue index 6f15773c9ab..a4a13389fbf 100644 --- a/app/assets/javascripts/ide/components/pipelines/list.vue +++ b/app/assets/javascripts/ide/components/pipelines/list.vue @@ -8,6 +8,7 @@ import { GlTabs, GlTab, GlBadge, + GlAlert, } from '@gitlab/ui'; import { sprintf, __ } from '../../../locale'; import CiIcon from '../../../vue_shared/components/ci_icon.vue'; @@ -26,6 +27,7 @@ export default { GlTabs, GlTab, GlBadge, + GlAlert, }, directives: { SafeHtml, @@ -89,11 +91,16 @@ export default { :can-set-ci="true" class="mb-auto mt-auto" /> -
+

{{ __('Found errors in your .gitlab-ci.yml:') }}

{{ latestPipeline.yamlError }}

-
+