From d8c06be498acbfc2024c01b6b6b02d120dc499f2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 14 Nov 2019 12:06:30 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../components/stage_card_list_item.vue | 44 --- .../components/stage_nav_item.vue | 36 +- .../repository/components/last_commit.vue | 17 +- .../repository/components/preview/index.vue | 2 +- .../queries/pathLastCommit.query.graphql | 18 +- .../javascripts/repository/utils/readme.js | 8 +- .../concerns/issuable_collections.rb | 2 +- app/controllers/groups/boards_controller.rb | 2 +- app/controllers/projects/boards_controller.rb | 2 +- app/graphql/resolvers/base_resolver.rb | 8 + .../resolvers/commit_pipelines_resolver.rb | 13 + app/graphql/types/commit_type.rb | 10 +- app/models/group.rb | 8 + app/models/merge_request.rb | 25 +- app/models/merge_request_diff.rb | 6 +- .../header/_current_user_dropdown.html.haml | 2 +- ...in-top-right-drop-down-to-include-gold.yml | 5 + .../36213-update-codequality-to-12-5.yml | 5 + .../unreleased/dz-move-project-routes.yml | 5 + .../unreleased/ff-user-ids-per-scope-fe.yml | 5 - ...oltsov-group-structure-export-api-endp.yml | 5 + ...avoid-preloading-merge-request-commits.yml | 5 + config/routes/project.rb | 55 ++- .../graphql/reference/gitlab_schema.graphql | 57 ++- doc/api/graphql/reference/gitlab_schema.json | 342 ++++++++++++------ .../container_scanning/index.md | 29 +- doc/user/project/clusters/serverless/index.md | 35 ++ lib/api/api.rb | 1 + lib/api/group_export.rb | 34 ++ .../templates/Jobs/Code-Quality.gitlab-ci.yml | 2 +- .../loaders/pipeline_for_sha_loader.rb | 25 -- locale/gitlab.pot | 5 +- .../files/user_reads_pipeline_status_spec.rb | 4 +- .../cycle_analytics/stage_nav_item_spec.js | 44 +-- .../repository/components/last_commit_spec.js | 4 +- .../preview/__snapshots__/index_spec.js.snap | 2 +- .../components/tree_content_spec.js | 2 +- spec/frontend/repository/utils/readme_spec.js | 33 ++ spec/graphql/resolvers/base_resolver_spec.rb | 24 ++ .../commit_pipelines_resolver_spec.rb | 53 +++ spec/graphql/types/commit_type_spec.rb | 2 +- .../ajax_variable_list_spec.js | 2 +- spec/lib/gitlab/fogbugz_import/client_spec.rb | 2 + .../loaders/pipeline_for_sha_loader_spec.rb | 20 - spec/models/merge_request_diff_spec.rb | 8 + spec/models/merge_request_spec.rb | 46 ++- spec/requests/api/group_export_spec.rb | 94 +++++ .../helpers/access_matchers_helpers.rb | 95 +++++ .../matchers/access_matchers_for_request.rb | 53 +++ .../matchers/access_matchers_generic.rb | 66 ++++ 50 files changed, 1009 insertions(+), 363 deletions(-) delete mode 100644 app/assets/javascripts/cycle_analytics/components/stage_card_list_item.vue create mode 100644 app/graphql/resolvers/commit_pipelines_resolver.rb create mode 100644 changelogs/unreleased/36141-update-start-a-trial-option-in-top-right-drop-down-to-include-gold.yml create mode 100644 changelogs/unreleased/36213-update-codequality-to-12-5.yml create mode 100644 changelogs/unreleased/dz-move-project-routes.yml delete mode 100644 changelogs/unreleased/ff-user-ids-per-scope-fe.yml create mode 100644 changelogs/unreleased/georgekoltsov-group-structure-export-api-endp.yml create mode 100644 changelogs/unreleased/id-avoid-preloading-merge-request-commits.yml create mode 100644 lib/api/group_export.rb delete mode 100644 lib/gitlab/graphql/loaders/pipeline_for_sha_loader.rb create mode 100644 spec/frontend/repository/utils/readme_spec.js create mode 100644 spec/graphql/resolvers/commit_pipelines_resolver_spec.rb delete mode 100644 spec/lib/gitlab/graphql/loaders/pipeline_for_sha_loader_spec.rb create mode 100644 spec/requests/api/group_export_spec.rb create mode 100644 spec/support/helpers/access_matchers_helpers.rb create mode 100644 spec/support/matchers/access_matchers_for_request.rb create mode 100644 spec/support/matchers/access_matchers_generic.rb diff --git a/app/assets/javascripts/cycle_analytics/components/stage_card_list_item.vue b/app/assets/javascripts/cycle_analytics/components/stage_card_list_item.vue deleted file mode 100644 index fc6d83bf96c..00000000000 --- a/app/assets/javascripts/cycle_analytics/components/stage_card_list_item.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - diff --git a/app/assets/javascripts/cycle_analytics/components/stage_nav_item.vue b/app/assets/javascripts/cycle_analytics/components/stage_nav_item.vue index 004d335f572..1b09fe1b370 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_nav_item.vue +++ b/app/assets/javascripts/cycle_analytics/components/stage_nav_item.vue @@ -1,11 +1,6 @@ - - + diff --git a/app/assets/javascripts/repository/components/last_commit.vue b/app/assets/javascripts/repository/components/last_commit.vue index 5cbe8d6247a..5a89efa4538 100644 --- a/app/assets/javascripts/repository/components/last_commit.vue +++ b/app/assets/javascripts/repository/components/last_commit.vue @@ -38,7 +38,14 @@ export default { path: this.currentPath.replace(/^\//, ''), }; }, - update: data => data.project.repository.tree.lastCommit, + update: data => { + const pipelines = data.project.repository.tree.lastCommit.pipelines.edges; + + return { + ...data.project.repository.tree.lastCommit, + pipeline: pipelines.length && pipelines[0].node, + }; + }, context: { isSingleRequest: true, }, @@ -61,7 +68,7 @@ export default { computed: { statusTitle() { return sprintf(s__('Commits|Commit: %{commitText}'), { - commitText: this.commit.latestPipeline.detailedStatus.text, + commitText: this.commit.pipeline.detailedStatus.text, }); }, isLoading() { @@ -127,14 +134,14 @@ export default {