From 914ea32e0efca21436220df2c10e1bfbe4ed3da9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 16 Oct 2019 09:07:51 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- Dangerfile | 1 + .../components/sidebar_app.vue | 23 ++ .../issuable_sidebar/sidebar_bundle.js | 27 ++ .../jobs/components/log/duration_badge.vue | 2 +- .../javascripts/jobs/components/log/line.vue | 10 +- .../jobs/components/log/line_header.vue | 12 +- .../jobs/components/log/line_number.vue | 2 +- .../javascripts/jobs/store/mutations.js | 2 +- .../monitoring/components/dashboard.vue | 2 - .../javascripts/pages/projects/issues/show.js | 7 +- .../pages/projects/issues/show/index.js | 4 +- .../merge_requests/init_merge_request_show.js | 7 +- .../projects/merge_requests/show/index.js | 4 +- app/assets/stylesheets/framework/common.scss | 1 + app/assets/stylesheets/framework/job_log.scss | 1 - app/controllers/groups_controller.rb | 3 +- app/controllers/projects/issues_controller.rb | 4 + .../projects/merge_requests_controller.rb | 4 + .../projects/pipelines_controller.rb | 2 +- app/models/ci/build.rb | 1 + app/models/ci/pipeline.rb | 6 + app/models/ci/pipeline_enums.rb | 1 + app/models/ci/sources/pipeline.rb | 25 ++ app/models/group.rb | 4 + app/models/project.rb | 3 + app/serializers/pipeline_details_entity.rb | 5 +- app/serializers/pipeline_serializer.rb | 6 +- app/serializers/triggered_pipeline_entity.rb | 65 ++++ app/services/ci/pipeline_trigger_service.rb | 29 +- app/services/groups/transfer_service.rb | 8 +- app/services/groups/update_service.rb | 16 + app/views/shared/issuable/_sidebar.html.haml | 318 +++++++++--------- ...or-docker-images-before-renaming-group.yml | 6 + ...eline-triggering-does-not-work-in-core.yml | 5 + lib/gitlab/daemon.rb | 12 +- lib/gitlab/danger/request_helper.rb | 23 ++ lib/gitlab/danger/roulette.rb | 33 +- lib/gitlab/danger/teammate.rb | 14 + lib/gitlab/gitaly_client/storage_service.rb | 0 lib/gitlab/metrics/exporter/base_exporter.rb | 9 +- lib/gitlab/metrics/samplers/base_sampler.rb | 5 + lib/gitlab/sidekiq_daemon/memory_killer.rb | 2 +- lib/gitlab/sidekiq_daemon/monitor.rb | 2 +- locale/gitlab.pot | 6 + spec/controllers/groups_controller_spec.rb | 45 +++ .../projects/pipelines_controller_spec.rb | 187 ++++++++++ spec/dependencies/omniauth_saml_spec.rb | 2 + spec/factories/ci/sources/pipelines.rb | 15 + spec/features/projects/jobs_spec.rb | 6 +- spec/finders/access_requests_finder_spec.rb | 2 + spec/finders/admin/projects_finder_spec.rb | 2 + .../move_to_project_finder_spec.rb | 2 + .../finders/autocomplete/users_finder_spec.rb | 2 + spec/finders/branches_finder_spec.rb | 2 + spec/finders/clusters_finder_spec.rb | 2 + spec/finders/concerns/finder_methods_spec.rb | 2 + .../finder_with_cross_project_access_spec.rb | 2 + .../contributed_projects_finder_spec.rb | 2 + spec/finders/environments_finder_spec.rb | 2 + spec/finders/events_finder_spec.rb | 2 + spec/finders/fork_projects_finder_spec.rb | 2 + spec/finders/group_descendants_finder_spec.rb | 2 + spec/finders/group_members_finder_spec.rb | 2 + spec/finders/group_projects_finder_spec.rb | 2 + spec/finders/groups_finder_spec.rb | 2 + spec/finders/issues_finder_spec.rb | 2 + spec/finders/joined_groups_finder_spec.rb | 2 + spec/finders/labels_finder_spec.rb | 2 + spec/finders/license_template_finder_spec.rb | 2 + spec/finders/members_finder_spec.rb | 2 + ...erge_request_target_project_finder_spec.rb | 2 + spec/finders/merge_requests_finder_spec.rb | 2 + spec/finders/milestones_finder_spec.rb | 2 + spec/finders/notes_finder_spec.rb | 2 + .../personal_access_tokens_finder_spec.rb | 2 + spec/finders/personal_projects_finder_spec.rb | 2 + .../finders/pipeline_schedules_finder_spec.rb | 2 + spec/finders/pipelines_finder_spec.rb | 2 + spec/finders/projects_finder_spec.rb | 2 + spec/finders/runner_jobs_finder_spec.rb | 2 + spec/finders/snippets_finder_spec.rb | 2 + spec/finders/tags_finder_spec.rb | 2 + spec/finders/template_finder_spec.rb | 2 + spec/finders/todos_finder_spec.rb | 2 + .../finders/user_recent_events_finder_spec.rb | 2 + spec/finders/users_finder_spec.rb | 2 + spec/lib/gitlab/daemon_spec.rb | 26 +- spec/lib/gitlab/danger/teammate_spec.rb | 66 +++- .../sidekiq_daemon/memory_killer_spec.rb | 8 +- .../lib/gitlab/sidekiq_daemon/monitor_spec.rb | 8 +- spec/models/ci/build_spec.rb | 9 +- spec/models/ci/pipeline_spec.rb | 6 + spec/models/ci/sources/pipeline_spec.rb | 19 ++ spec/models/project_spec.rb | 2 + .../pipeline_details_entity_spec.rb | 35 ++ spec/serializers/pipeline_serializer_spec.rb | 5 +- .../ci/pipeline_trigger_service_spec.rb | 162 ++++++--- spec/services/groups/transfer_service_spec.rb | 17 + spec/services/groups/update_service_spec.rb | 24 ++ spec/spec_helper.rb | 11 + 100 files changed, 1171 insertions(+), 278 deletions(-) create mode 100644 app/assets/javascripts/issuable_sidebar/components/sidebar_app.vue create mode 100644 app/assets/javascripts/issuable_sidebar/sidebar_bundle.js create mode 100644 app/models/ci/sources/pipeline.rb create mode 100644 app/serializers/triggered_pipeline_entity.rb create mode 100644 changelogs/unreleased/28243-check-for-docker-images-before-renaming-group.yml create mode 100644 changelogs/unreleased/31573-cross-project-pipeline-triggering-does-not-work-in-core.yml create mode 100644 lib/gitlab/danger/request_helper.rb delete mode 100644 lib/gitlab/gitaly_client/storage_service.rb create mode 100644 spec/factories/ci/sources/pipelines.rb create mode 100644 spec/models/ci/sources/pipeline_spec.rb diff --git a/Dangerfile b/Dangerfile index 228190cd530..b65a9074078 100644 --- a/Dangerfile +++ b/Dangerfile @@ -1,6 +1,7 @@ # frozen_string_literal: true require_relative 'lib/gitlab_danger' +require_relative 'lib/gitlab/danger/request_helper' danger.import_plugin('danger/plugins/helper.rb') danger.import_plugin('danger/plugins/roulette.rb') diff --git a/app/assets/javascripts/issuable_sidebar/components/sidebar_app.vue b/app/assets/javascripts/issuable_sidebar/components/sidebar_app.vue new file mode 100644 index 00000000000..06c50f62aab --- /dev/null +++ b/app/assets/javascripts/issuable_sidebar/components/sidebar_app.vue @@ -0,0 +1,23 @@ + + + diff --git a/app/assets/javascripts/issuable_sidebar/sidebar_bundle.js b/app/assets/javascripts/issuable_sidebar/sidebar_bundle.js new file mode 100644 index 00000000000..c8acafa8cd8 --- /dev/null +++ b/app/assets/javascripts/issuable_sidebar/sidebar_bundle.js @@ -0,0 +1,27 @@ +import Vue from 'vue'; + +import SidebarApp from './components/sidebar_app.vue'; + +export default () => { + const el = document.getElementById('js-vue-issuable-sidebar'); + + if (!el) { + return false; + } + + const { sidebarStatusClass } = el.dataset; + // An empty string is present when user is signed in. + const signedIn = el.dataset.signedIn === ''; + + return new Vue({ + el, + components: { SidebarApp }, + render: createElement => + createElement('sidebar-app', { + props: { + signedIn, + sidebarStatusClass, + }, + }), + }); +}; diff --git a/app/assets/javascripts/jobs/components/log/duration_badge.vue b/app/assets/javascripts/jobs/components/log/duration_badge.vue index 31a101d2c95..8e5dcdcc902 100644 --- a/app/assets/javascripts/jobs/components/log/duration_badge.vue +++ b/app/assets/javascripts/jobs/components/log/duration_badge.vue @@ -9,7 +9,7 @@ export default { }; diff --git a/app/assets/javascripts/jobs/components/log/line.vue b/app/assets/javascripts/jobs/components/log/line.vue index 9fae541125e..33ee84bd4ee 100644 --- a/app/assets/javascripts/jobs/components/log/line.vue +++ b/app/assets/javascripts/jobs/components/log/line.vue @@ -21,8 +21,12 @@ export default { diff --git a/app/assets/javascripts/jobs/components/log/line_header.vue b/app/assets/javascripts/jobs/components/log/line_header.vue index 92cf3b3cf5f..85ccd5996b5 100644 --- a/app/assets/javascripts/jobs/components/log/line_header.vue +++ b/app/assets/javascripts/jobs/components/log/line_header.vue @@ -43,15 +43,19 @@ export default { diff --git a/app/assets/javascripts/jobs/components/log/line_number.vue b/app/assets/javascripts/jobs/components/log/line_number.vue index 08c4a7ed330..ae96c32874b 100644 --- a/app/assets/javascripts/jobs/components/log/line_number.vue +++ b/app/assets/javascripts/jobs/components/log/line_number.vue @@ -48,7 +48,7 @@ export default {