From 1308dc5eb484ab0f8064989fc551ebdb4b1a7976 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 13 Feb 2020 12:08:49 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../code_navigation/store/actions.js | 3 - .../javascripts/diffs/components/app.vue | 2 +- app/assets/javascripts/flash.js | 2 +- .../ide/components/commit_sidebar/form.vue | 12 +- .../ide/components/file_row_extra.vue | 15 +- app/assets/javascripts/ide/stores/actions.js | 9 +- .../javascripts/ide/stores/actions/file.js | 4 +- .../explorer/components/group_empty_state.vue | 39 ++ .../components/project_empty_state.vue | 113 ++++++ .../registry/explorer/pages/details.vue | 329 ++++++++++++++- .../registry/explorer/pages/list.vue | 211 +++++++++- .../registry/explorer/stores/actions.js | 4 +- .../registry/explorer/stores/mutations.js | 1 + app/controllers/ide_controller.rb | 4 - app/models/ci/bridge.rb | 3 +- app/models/ci/pipeline.rb | 24 +- app/models/concerns/ci/pipeline_delegator.rb | 2 +- app/models/concerns/has_ref.rb | 2 +- app/models/concerns/reactive_caching.rb | 2 + app/models/merge_request.rb | 2 +- app/models/merge_request/pipelines.rb | 2 + app/models/wiki_page.rb | 18 +- app/presenters/ci/pipeline_presenter.rb | 2 +- app/serializers/pipeline_entity.rb | 8 +- .../merge_requests/create_pipeline_service.rb | 2 +- .../registry/repositories/index.html.haml | 1 + .../components/_diff_file_editor.html.haml | 2 +- .../merge_requests/conflicts/show.html.haml | 2 +- .../creations/_new_compare.html.haml | 6 +- .../creations/_new_submit.html.haml | 3 +- .../projects/merge_requests/show.html.haml | 3 +- app/views/projects/wikis/_form.html.haml | 6 +- .../196690-replace-_-with-lodash.yml | 5 + .../24415-restrict-wiki-page-titles.yml | 5 + .../fix-child-parent-pipeline-for-mr.yml | 5 + .../jh-fix-substitution-definition-regex.yml | 5 + doc/administration/instance_limits.md | 4 + doc/administration/operations/unicorn.md | 7 +- doc/development/fe_guide/graphql.md | 6 +- doc/install/aws/img/aws_diagram.png | Bin 502497 -> 0 bytes .../aws/img/aws_ha_architecture_diagram.png | Bin 0 -> 133747 bytes doc/install/aws/index.md | 33 +- doc/user/project/wiki/index.md | 18 + lib/api/group_clusters.rb | 4 +- lib/api/project_clusters.rb | 4 +- .../quick_actions/substitution_definition.rb | 4 +- locale/gitlab.pot | 45 +- ...closes_issue_via_pushing_a_commit_spec.rb} | 26 +- .../2_plan/issue/create_issue_spec.rb | 4 +- .../code_navigation/store/actions_spec.js | 9 - spec/frontend/ide/stores/actions/file_spec.js | 70 +--- spec/frontend/ide/stores/integration_spec.js | 15 +- .../group_empty_state_spec.js.snap | 21 + .../project_empty_state_spec.js.snap | 119 ++++++ .../components/group_empty_state_spec.js | 40 ++ .../components/project_empty_state_spec.js | 44 ++ spec/frontend/registry/explorer/mock_data.js | 51 +++ .../registry/explorer/pages/details_spec.js | 293 ++++++++++++++ .../registry/explorer/pages/list_spec.js | 205 ++++++++++ .../registry/explorer/stores/actions_spec.js | 9 +- .../explorer/stores/mutations_spec.js | 5 +- spec/frontend/registry/explorer/stubs.js | 11 + spec/javascripts/flash_spec.js | 2 +- .../components/commit_sidebar/form_spec.js | 2 +- .../ide/components/file_row_extra_spec.js | 2 +- spec/javascripts/ide/stores/actions_spec.js | 101 +---- .../project_selector/project_selector_spec.js | 6 +- .../substitution_definition_spec.rb | 26 +- spec/models/ci/build_spec.rb | 2 +- spec/models/ci/pipeline_spec.rb | 69 +--- spec/models/wiki_page_spec.rb | 383 ++++++++++-------- ...ate_cross_project_pipeline_service_spec.rb | 32 +- .../ci/create_pipeline_service_spec.rb | 50 +-- spec/support/helpers/kubernetes_helpers.rb | 2 +- 74 files changed, 2018 insertions(+), 564 deletions(-) create mode 100644 app/assets/javascripts/registry/explorer/components/group_empty_state.vue create mode 100644 app/assets/javascripts/registry/explorer/components/project_empty_state.vue create mode 100644 changelogs/unreleased/196690-replace-_-with-lodash.yml create mode 100644 changelogs/unreleased/24415-restrict-wiki-page-titles.yml create mode 100644 changelogs/unreleased/fix-child-parent-pipeline-for-mr.yml create mode 100644 changelogs/unreleased/jh-fix-substitution-definition-regex.yml delete mode 100644 doc/install/aws/img/aws_diagram.png create mode 100644 doc/install/aws/img/aws_ha_architecture_diagram.png rename qa/qa/specs/features/{browser_ui/2_plan/issue/close_issue_spec.rb => api/2_plan/closes_issue_via_pushing_a_commit_spec.rb} (64%) create mode 100644 spec/frontend/registry/explorer/components/__snapshots__/group_empty_state_spec.js.snap create mode 100644 spec/frontend/registry/explorer/components/__snapshots__/project_empty_state_spec.js.snap create mode 100644 spec/frontend/registry/explorer/components/group_empty_state_spec.js create mode 100644 spec/frontend/registry/explorer/components/project_empty_state_spec.js create mode 100644 spec/frontend/registry/explorer/pages/details_spec.js create mode 100644 spec/frontend/registry/explorer/pages/list_spec.js create mode 100644 spec/frontend/registry/explorer/stubs.js diff --git a/app/assets/javascripts/code_navigation/store/actions.js b/app/assets/javascripts/code_navigation/store/actions.js index cb6d30c775d..2c52074e362 100644 --- a/app/assets/javascripts/code_navigation/store/actions.js +++ b/app/assets/javascripts/code_navigation/store/actions.js @@ -1,6 +1,4 @@ import api from '~/api'; -import { __ } from '~/locale'; -import createFlash from '~/flash'; import * as types from './mutation_types'; import { getCurrentHoverElement, setCurrentHoverElement, addInteractionClass } from '../utils'; @@ -10,7 +8,6 @@ export default { }, requestDataError({ commit }) { commit(types.REQUEST_DATA_ERROR); - createFlash(__('An error occurred loading code navigation')); }, fetchData({ commit, dispatch, state }) { commit(types.REQUEST_DATA); diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue index 878b54f7d53..f9d3d31e152 100644 --- a/app/assets/javascripts/diffs/components/app.vue +++ b/app/assets/javascripts/diffs/components/app.vue @@ -354,7 +354,7 @@ export default {