From c5d67a0495ba5bd66f72b9a02da4d351c027c6bd Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 23 Sep 2020 18:10:15 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../pipelines/components/dag/constants.js | 6 - .../javascripts/pipelines/components/dag/dag.vue | 11 +- .../pipelines/components/dag/dag_graph.vue | 10 +- .../pipelines/components/header_component.vue | 166 ++++++++++++++----- .../components/legacy_header_component.vue | 132 +++++++++++++++ app/assets/javascripts/pipelines/constants.js | 8 + .../queries/get_pipeline_header_data.query.graphql | 30 ++++ .../pipelines/pipeline_details_bundle.js | 16 +- .../pipelines/pipeline_details_header.js | 41 +++++ .../components/states/mr_widget_rebase.vue | 24 +-- .../vue_shared/components/ci_badge_link.vue | 16 +- .../vue_shared/components/header_ci_component.vue | 44 ++++- app/assets/stylesheets/framework/variables.scss | 3 - app/assets/stylesheets/pages/profile.scss | 17 -- app/controllers/projects/jobs_controller.rb | 5 - app/controllers/projects/pipelines_controller.rb | 1 + .../design_management/save_designs_service.rb | 1 + app/views/projects/pipelines/show.html.haml | 3 +- changelogs/unreleased/khanchi-designs-patch.yml | 5 + .../development/graphql_milestone_stats.yml | 6 +- .../development/graphql_pipeline_header.yml | 7 + .../development/graphql_release_data.yml | 6 +- .../development/graphql_releases_page.yml | 6 +- .../feature_flags/development/new_release_page.yml | 6 +- .../development/release_asset_link_editing.yml | 6 +- .../development/release_asset_link_type.yml | 6 +- .../development/release_issue_summary.yml | 6 +- .../development/release_show_page.yml | 6 +- doc/administration/geo/disaster_recovery/index.md | 9 ++ doc/administration/geo/index.md | 4 + doc/administration/libravatar.md | 4 +- doc/administration/read_only_gitlab.md | 125 +++++++++++++++ doc/operations/feature_flags.md | 9 +- doc/user/clusters/applications.md | 87 +++++----- .../img/group_dependency_proxy.png | Bin 29334 -> 0 bytes doc/user/packages/dependency_proxy/index.md | 92 +++++------ .../database/partitioning/partition_creator.rb | 4 +- .../database/reindexing/concurrent_reindex.rb | 2 +- lib/gitlab/database/schema_helpers.rb | 4 +- locale/gitlab.pot | 6 + spec/controllers/projects/jobs_controller_spec.rb | 7 - spec/features/commits_spec.rb | 1 + spec/features/projects/pipelines/pipeline_spec.rb | 17 +- spec/frontend/pipelines/components/dag/dag_spec.js | 9 +- spec/frontend/pipelines/header_component_spec.js | 177 +++++++++++++-------- .../pipelines/legacy_header_component_spec.js | 116 ++++++++++++++ spec/frontend/pipelines/mock_data.js | 78 +++++++++ .../components/mr_widget_rebase_spec.js | 22 ++- .../design_management/save_designs_service_spec.rb | 8 + 49 files changed, 1030 insertions(+), 345 deletions(-) create mode 100644 app/assets/javascripts/pipelines/components/legacy_header_component.vue create mode 100644 app/assets/javascripts/pipelines/graphql/queries/get_pipeline_header_data.query.graphql create mode 100644 app/assets/javascripts/pipelines/pipeline_details_header.js create mode 100644 changelogs/unreleased/khanchi-designs-patch.yml create mode 100644 config/feature_flags/development/graphql_pipeline_header.yml create mode 100644 doc/administration/read_only_gitlab.md delete mode 100644 doc/user/packages/dependency_proxy/img/group_dependency_proxy.png create mode 100644 spec/frontend/pipelines/legacy_header_component_spec.js diff --git a/app/assets/javascripts/pipelines/components/dag/constants.js b/app/assets/javascripts/pipelines/components/dag/constants.js index b6a98fdc488..cd89055737f 100644 --- a/app/assets/javascripts/pipelines/components/dag/constants.js +++ b/app/assets/javascripts/pipelines/components/dag/constants.js @@ -1,9 +1,3 @@ -/* Error constants */ -export const PARSE_FAILURE = 'parse_failure'; -export const LOAD_FAILURE = 'load_failure'; -export const UNSUPPORTED_DATA = 'unsupported_data'; -export const DEFAULT = 'default'; - /* Interaction handles */ export const IS_HIGHLIGHTED = 'dag-highlighted'; export const LINK_SELECTOR = 'dag-link'; diff --git a/app/assets/javascripts/pipelines/components/dag/dag.vue b/app/assets/javascripts/pipelines/components/dag/dag.vue index 8487da3d621..ab736061a2e 100644 --- a/app/assets/javascripts/pipelines/components/dag/dag.vue +++ b/app/assets/javascripts/pipelines/components/dag/dag.vue @@ -6,16 +6,9 @@ import { fetchPolicies } from '~/lib/graphql'; import getDagVisData from '../../graphql/queries/get_dag_vis_data.query.graphql'; import DagGraph from './dag_graph.vue'; import DagAnnotations from './dag_annotations.vue'; -import { - DEFAULT, - PARSE_FAILURE, - LOAD_FAILURE, - UNSUPPORTED_DATA, - ADD_NOTE, - REMOVE_NOTE, - REPLACE_NOTES, -} from './constants'; +import { ADD_NOTE, REMOVE_NOTE, REPLACE_NOTES } from './constants'; import { parseData } from './parsing_utils'; +import { DEFAULT, PARSE_FAILURE, LOAD_FAILURE, UNSUPPORTED_DATA } from '../../constants'; export default { // eslint-disable-next-line @gitlab/require-i18n-strings diff --git a/app/assets/javascripts/pipelines/components/dag/dag_graph.vue b/app/assets/javascripts/pipelines/components/dag/dag_graph.vue index d12baa9617e..34ff89a5e6f 100644 --- a/app/assets/javascripts/pipelines/components/dag/dag_graph.vue +++ b/app/assets/javascripts/pipelines/components/dag/dag_graph.vue @@ -1,14 +1,7 @@