From f5dcc7ae73d1744b7737c16411af6281d78bc455 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 12 Oct 2020 21:08:56 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/api.js | 9 ++ .../components/design_sidebar.vue | 11 +- .../mr_widget_options.vue | 11 ++ .../stores/mr_widget_store.js | 1 + .../access_request_action_buttons.vue | 7 +- .../approve_access_request_button.vue | 42 +++++++ .../security_reports/security_reports_app.vue | 107 ++++++++++++++++ .../stylesheets/_page_specific_files.scss | 1 - .../dev_ops_report.scss | 60 ++++----- .../stylesheets/page_bundles/pipeline.scss | 14 +++ app/assets/stylesheets/pages/pipelines.scss | 14 --- app/controllers/projects/issues_controller.rb | 1 - .../projects/merge_requests_controller.rb | 1 + .../merge_request_widget_entity.rb | 4 + app/views/admin/dev_ops_report/show.html.haml | 1 + app/views/profiles/accounts/show.html.haml | 2 +- config/application.rb | 1 + ...button.yml => core_security_mr_widget.yml} | 10 +- doc/user/project/issues/design_management.md | 27 +--- locale/gitlab.pot | 9 ++ qa/qa.rb | 2 + qa/qa/git/repository.rb | 107 ++++++---------- qa/qa/page/profile/accounts/show.rb | 5 + .../1_manage/login/2fa_ssh_recovery_spec.rb | 65 ++++++++++ .../push_over_http_file_size_spec.rb | 2 +- .../repository/push_protected_branch_spec.rb | 2 +- .../clone_push_pull_personal_snippet_spec.rb | 2 +- .../clone_push_pull_project_snippet_spec.rb | 2 +- qa/qa/support/otp.rb | 5 +- qa/qa/support/retrier.rb | 17 +-- qa/qa/support/run.rb | 43 +++++++ qa/qa/support/ssh.rb | 62 +++++++++ qa/spec/git/repository_spec.rb | 22 ++-- qa/spec/support/run_spec.rb | 27 ++++ qa/spec/support/ssh_spec.rb | 114 +++++++++++++++++ spec/frontend/api_spec.js | 21 ++++ .../components/design_sidebar_spec.js | 30 ++--- .../design/__snapshots__/index_spec.js.snap | 28 ++++- spec/frontend/vue_mr_widget/mock_data.js | 1 + .../vue_mr_widget/mr_widget_options_spec.js | 41 +++++- .../stores/mr_widget_store_spec.js | 14 ++- .../access_request_action_buttons_spec.js | 26 ++++ .../approve_access_request_button_spec.js | 74 +++++++++++ .../security_reports_app_spec.js | 118 ++++++++++++++++++ .../merge_request_widget_entity_spec.rb | 4 + 45 files changed, 955 insertions(+), 212 deletions(-) create mode 100644 app/assets/javascripts/vue_shared/components/members/action_buttons/approve_access_request_button.vue create mode 100644 app/assets/javascripts/vue_shared/security_reports/security_reports_app.vue rename app/assets/stylesheets/{pages => page_bundles}/dev_ops_report.scss (67%) rename config/feature_flags/development/{design_management_todo_button.yml => core_security_mr_widget.yml} (58%) create mode 100644 qa/qa/specs/features/browser_ui/1_manage/login/2fa_ssh_recovery_spec.rb create mode 100644 qa/qa/support/run.rb create mode 100644 qa/qa/support/ssh.rb create mode 100644 qa/spec/support/run_spec.rb create mode 100644 qa/spec/support/ssh_spec.rb create mode 100644 spec/frontend/vue_shared/components/members/action_buttons/approve_access_request_button_spec.js create mode 100644 spec/frontend/vue_shared/security_reports/security_reports_app_spec.js diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index a87f89efd70..996ca4e8b73 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -54,6 +54,7 @@ const Api = { releaseLinkPath: '/api/:version/projects/:id/releases/:tag_name/assets/links/:link_id', mergeRequestsPipeline: '/api/:version/projects/:id/merge_requests/:merge_request_iid/pipelines', adminStatisticsPath: '/api/:version/application/statistics', + pipelineJobsPath: '/api/:version/projects/:id/pipelines/:pipeline_id/jobs', pipelineSinglePath: '/api/:version/projects/:id/pipelines/:pipeline_id', pipelinesPath: '/api/:version/projects/:id/pipelines/', createPipelinePath: '/api/:version/projects/:id/pipeline', @@ -599,6 +600,14 @@ const Api = { return axios.get(url); }, + pipelineJobs(projectId, pipelineId) { + const url = Api.buildUrl(this.pipelineJobsPath) + .replace(':id', encodeURIComponent(projectId)) + .replace(':pipeline_id', encodeURIComponent(pipelineId)); + + return axios.get(url); + }, + // Return all pipelines for a project or filter by query params pipelines(id, options = {}) { const url = Api.buildUrl(this.pipelinesPath).replace(':id', encodeURIComponent(id)); diff --git a/app/assets/javascripts/design_management/components/design_sidebar.vue b/app/assets/javascripts/design_management/components/design_sidebar.vue index fecedceef32..fb8e74c8c4c 100644 --- a/app/assets/javascripts/design_management/components/design_sidebar.vue +++ b/app/assets/javascripts/design_management/components/design_sidebar.vue @@ -71,14 +71,6 @@ export default { resolvedCommentsToggleIcon() { return this.resolvedDiscussionsExpanded ? 'chevron-down' : 'chevron-right'; }, - showTodoButton() { - return this.glFeatures.designManagementTodoButton; - }, - sidebarWrapperClass() { - return { - 'gl-pt-0': this.showTodoButton, - }; - }, }, watch: { isResolvedCommentsPopoverHidden(newVal) { @@ -121,9 +113,8 @@ export default {