From 184c2ced0761bd8dd7032619d16d3983fed7944a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 17 Oct 2019 18:08:05 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../javascripts/jobs/components/job_app.vue | 11 ++- app/assets/javascripts/lib/utils/set.js | 9 +++ .../components/collapsible_container.vue | 26 ++++-- .../registry/components/table_registry.vue | 29 ++++--- app/assets/stylesheets/framework/blank.scss | 49 +++++------ .../stylesheets/framework/typography.scss | 4 - .../registry/repositories_controller.rb | 5 ++ app/helpers/groups_helper.rb | 4 +- app/mailers/emails/releases.rb | 28 +++++++ app/mailers/notify.rb | 1 + app/models/ci/build.rb | 4 + app/models/notification_setting.rb | 1 + app/models/release.rb | 6 ++ app/serializers/build_details_entity.rb | 24 ++++++ .../notification_recipient_service.rb | 24 ++++++ app/services/notification_service.rb | 9 +++ app/views/admin/runners/index.html.haml | 5 +- .../_blank_state_admin_welcome.html.haml | 67 ++++++++------- .../projects/_blank_state_welcome.html.haml | 76 +++++++++--------- .../_zero_authorized_projects.html.haml | 15 ++-- app/views/notify/new_release_email.html.haml | 18 +++++ app/views/notify/new_release_email.text.erb | 12 +++ .../projects/settings/ci_cd/_form.html.haml | 4 +- .../shared/issuable/_search_bar.html.haml | 5 +- app/workers/all_queues.yml | 2 + app/workers/new_release_worker.rb | 14 ++++ .../26001-notification-release-be.yml | 5 ++ ...0619-make-recent-searches-more-visible.yml | 5 ++ ...-the-last-tag-of-an-image-it-will-remo.yml | 6 ++ ...ensure-proper-access-level-check-on-pa.yml | 5 ++ ...-on-modal-delete-button-and-title-text.yml | 5 ++ .../unreleased/45797-welcome-screen.yml | 5 ++ ...ng-dependencies-custom-callout-message.yml | 6 ++ ...ve-flag-geo_object_storage_replication.yml | 5 ++ config/initializers/lograge.rb | 4 + config/sidekiq_queues.yml | 1 + ...dd_new_release_to_notification_settings.rb | 9 +++ db/schema.rb | 1 + .../high_availability/README.md | 11 ++- doc/api/graphql/reference/index.md | 1 + doc/api/releases/index.md | 24 ------ doc/ci/README.md | 2 +- doc/user/project/code_owners.md | 23 +++++- ...rs_approval_new_protected_branch_v12_4.png | Bin 0 -> 141341 bytes ...owners_approval_protected_branch_v12_4.png | Bin 0 -> 16195 bytes .../img/code_owners_mr_widget_v12_4.png | Bin 0 -> 27875 bytes .../img/mr_approvals_by_code_owners_v12_4.png | Bin 0 -> 26902 bytes .../merge_requests/merge_request_approvals.md | 47 ++++++----- doc/user/project/pipelines/settings.md | 8 +- doc/user/project/protected_branches.md | 43 ++++++---- ...custom_notifications_new_release_v12_4.png | Bin 0 -> 65959 bytes doc/user/project/releases/index.md | 12 +++ doc/workflow/notifications.md | 1 + lib/api/entities.rb | 8 +- lib/gitlab/metrics/system.rb | 2 + lib/gitlab/request_context.rb | 6 ++ locale/gitlab.pot | 40 +++++++-- locale/unfound_translations.rb | 1 + spec/frontend/lib/utils/set_spec.js | 19 +++++ .../components/table_registry_spec.js | 16 ++-- .../types/notes/diff_position_type_spec.rb | 2 +- spec/initializers/lograge_spec.rb | 33 ++++++++ .../cluster/mixins/puma_cluster_spec.rb | 5 +- .../mixins/unicorn_http_server_spec.rb | 5 +- spec/lib/gitlab/metrics/system_spec.rb | 40 +++++++++ spec/mailers/emails/releases_spec.rb | 52 ++++++++++++ spec/models/ci/build_spec.rb | 10 +++ spec/models/notification_setting_spec.rb | 1 + spec/models/release_spec.rb | 20 +++++ spec/serializers/build_details_entity_spec.rb | 18 +++++ spec/services/notification_service_spec.rb | 21 +++++ spec/support/matchers/graphql_matchers.rb | 10 ++- spec/workers/new_release_worker_spec.rb | 13 +++ 73 files changed, 763 insertions(+), 240 deletions(-) create mode 100644 app/assets/javascripts/lib/utils/set.js create mode 100644 app/mailers/emails/releases.rb create mode 100644 app/views/notify/new_release_email.html.haml create mode 100644 app/views/notify/new_release_email.text.erb create mode 100644 app/workers/new_release_worker.rb create mode 100644 changelogs/unreleased/26001-notification-release-be.yml create mode 100644 changelogs/unreleased/30619-make-recent-searches-more-visible.yml create mode 100644 changelogs/unreleased/32919-inform-the-user-that-removing-the-last-tag-of-an-image-it-will-remo.yml create mode 100644 changelogs/unreleased/33876-ensure-proper-access-level-check-on-pa.yml create mode 100644 changelogs/unreleased/34032-container-registry-bug-on-modal-delete-button-and-title-text.yml create mode 100644 changelogs/unreleased/45797-welcome-screen.yml create mode 100644 changelogs/unreleased/eb-missing-dependencies-custom-callout-message.yml create mode 100644 changelogs/unreleased/mk-remove-flag-geo_object_storage_replication.yml create mode 100644 db/migrate/20190930082942_add_new_release_to_notification_settings.rb create mode 100755 doc/user/project/img/code_owners_approval_new_protected_branch_v12_4.png create mode 100755 doc/user/project/img/code_owners_approval_protected_branch_v12_4.png create mode 100644 doc/user/project/img/code_owners_mr_widget_v12_4.png create mode 100755 doc/user/project/merge_requests/img/mr_approvals_by_code_owners_v12_4.png create mode 100644 doc/user/project/releases/img/custom_notifications_new_release_v12_4.png create mode 100644 spec/frontend/lib/utils/set_spec.js create mode 100644 spec/mailers/emails/releases_spec.rb create mode 100644 spec/workers/new_release_worker_spec.rb diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue index b4b124d5db1..859f839741f 100644 --- a/app/assets/javascripts/jobs/components/job_app.vue +++ b/app/assets/javascripts/jobs/components/job_app.vue @@ -130,6 +130,10 @@ export default { return title; }, + + shouldRenderHeaderCallout() { + return this.shouldRenderCalloutMessage && !this.hasUnmetPrerequisitesFailure; + }, }, watch: { // Once the job log is loaded, @@ -239,10 +243,9 @@ export default { /> - + +
+
diff --git a/app/assets/javascripts/lib/utils/set.js b/app/assets/javascripts/lib/utils/set.js new file mode 100644 index 00000000000..3845d648b61 --- /dev/null +++ b/app/assets/javascripts/lib/utils/set.js @@ -0,0 +1,9 @@ +/** + * Checks if the first argument is a subset of the second argument. + * @param {Set} subset The set to be considered as the subset. + * @param {Set} superset The set to be considered as the superset. + * @returns {boolean} + */ +// eslint-disable-next-line import/prefer-default-export +export const isSubset = (subset, superset) => + Array.from(subset).every(value => superset.has(value)); diff --git a/app/assets/javascripts/registry/components/collapsible_container.vue b/app/assets/javascripts/registry/components/collapsible_container.vue index ed48331f459..95f8270b5d0 100644 --- a/app/assets/javascripts/registry/components/collapsible_container.vue +++ b/app/assets/javascripts/registry/components/collapsible_container.vue @@ -1,6 +1,13 @@