From f4186a753b86625a83e8499af14b5badd63a2ac2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 9 Mar 2020 09:07:45 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../blob/components/blob_edit_content.vue | 49 ++++ app/assets/javascripts/blob/utils.js | 24 ++ .../boards/components/issue_card_inner.vue | 36 +-- .../issue_card_inner_scoped_label.vue | 45 --- .../clusters_list/components/clusters.vue | 34 ++- .../javascripts/clusters_list/constants.js | 8 +- .../javascripts/clusters_list/store/state.js | 16 +- .../javascripts/snippet/snippet_bundle.js | 12 +- .../snippets/components/snippet_blob_edit.vue | 36 +++ app/assets/javascripts/tracking.js | 2 + .../sidebar/labels_select/dropdown_value.vue | 31 +- .../dropdown_value_regular_label.vue | 39 --- .../dropdown_value_scoped_label.vue | 52 ---- app/assets/stylesheets/pages/boards.scss | 17 +- app/assets/stylesheets/pages/clusters.scss | 6 + app/assets/stylesheets/pages/issuable.scss | 4 + app/assets/stylesheets/utilities.scss | 2 + .../ci/pipelines_for_merge_request_finder.rb | 90 ++++++ app/models/merge_request.rb | 2 +- app/models/merge_request/pipelines.rb | 88 ------ ...y-configuration-page-to-follow-design-.yml | 5 + .../35475-add-prometheus-ci-vars.yml | 5 + ...labels-in-vue-with-gitlab-ui-component.yml | 5 + .../unreleased/show-cluster-status-fe.yml | 5 + doc/administration/gitaly/index.md | 6 + doc/administration/gitaly/praefect.md | 59 +++- doc/administration/raketasks/maintenance.md | 1 + doc/development/packages.md | 173 +++++++---- .../configuration/index.md | 2 +- .../img/security_configuration_page_v12_6.png | Bin 68210 -> 0 bytes .../img/security_configuration_page_v12_9.png | Bin 0 -> 51545 bytes doc/user/packages/workflows/monorepo.md | 6 +- doc/user/project/clusters/serverless/aws.md | 272 ++++++++++++++++-- .../serverless/img/sam-api-endpoint.png | Bin 0 -> 59484 bytes .../serverless/img/sam-complete-raw.png | Bin 0 -> 100590 bytes doc/user/project/integrations/prometheus.md | 13 +- lib/gitlab/prometheus/query_variables.rb | 6 +- locale/gitlab.pot | 28 +- package.json | 6 +- spec/features/boards/boards_spec.rb | 4 +- spec/features/boards/sidebar_spec.rb | 4 +- ...ipelines_for_merge_request_finder_spec.rb} | 2 +- .../blob_edit_content_spec.js.snap | 14 + .../blob/components/blob_edit_content_spec.js | 81 ++++++ spec/frontend/blob/utils_spec.js | 95 ++++++ .../issue_card_inner_scoped_label_spec.js | 40 --- spec/frontend/boards/issue_card_spec.js | 32 +-- .../clusters_list/components/clusters_spec.js | 27 +- spec/frontend/clusters_list/mock_data.js | 37 +++ .../snippet_blob_edit_spec.js.snap | 24 ++ .../components/snippet_blob_edit_spec.js | 40 +++ .../labels_select/dropdown_value_spec.js | 61 +--- spec/javascripts/boards/board_card_spec.js | 8 +- .../gitlab/prometheus/query_variables_spec.rb | 4 + yarn.lock | 24 +- 55 files changed, 1133 insertions(+), 549 deletions(-) create mode 100644 app/assets/javascripts/blob/components/blob_edit_content.vue create mode 100644 app/assets/javascripts/blob/utils.js delete mode 100644 app/assets/javascripts/boards/components/issue_card_inner_scoped_label.vue create mode 100644 app/assets/javascripts/snippets/components/snippet_blob_edit.vue delete mode 100644 app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_regular_label.vue delete mode 100644 app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_scoped_label.vue create mode 100644 app/finders/ci/pipelines_for_merge_request_finder.rb delete mode 100644 app/models/merge_request/pipelines.rb create mode 100644 changelogs/unreleased/207367-change-link-icons-on-security-configuration-page-to-follow-design-.yml create mode 100644 changelogs/unreleased/35475-add-prometheus-ci-vars.yml create mode 100644 changelogs/unreleased/38143-replace-labels-in-vue-with-gitlab-ui-component.yml create mode 100644 changelogs/unreleased/show-cluster-status-fe.yml delete mode 100644 doc/user/application_security/img/security_configuration_page_v12_6.png create mode 100644 doc/user/application_security/img/security_configuration_page_v12_9.png create mode 100644 doc/user/project/clusters/serverless/img/sam-api-endpoint.png create mode 100644 doc/user/project/clusters/serverless/img/sam-complete-raw.png rename spec/{models/merge_request/pipelines_spec.rb => finders/ci/pipelines_for_merge_request_finder_spec.rb} (99%) create mode 100644 spec/frontend/blob/components/__snapshots__/blob_edit_content_spec.js.snap create mode 100644 spec/frontend/blob/components/blob_edit_content_spec.js create mode 100644 spec/frontend/blob/utils_spec.js delete mode 100644 spec/frontend/boards/components/issue_card_inner_scoped_label_spec.js create mode 100644 spec/frontend/clusters_list/mock_data.js create mode 100644 spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap create mode 100644 spec/frontend/snippets/components/snippet_blob_edit_spec.js diff --git a/app/assets/javascripts/blob/components/blob_edit_content.vue b/app/assets/javascripts/blob/components/blob_edit_content.vue new file mode 100644 index 00000000000..83303a373f3 --- /dev/null +++ b/app/assets/javascripts/blob/components/blob_edit_content.vue @@ -0,0 +1,49 @@ + + diff --git a/app/assets/javascripts/blob/utils.js b/app/assets/javascripts/blob/utils.js new file mode 100644 index 00000000000..dc2ec642e59 --- /dev/null +++ b/app/assets/javascripts/blob/utils.js @@ -0,0 +1,24 @@ +/* global ace */ +import Editor from '~/editor/editor_lite'; + +export function initEditorLite({ el, blobPath, blobContent }) { + if (!el) { + throw new Error(`"el" parameter is required to initialize Editor`); + } + let editor; + + if (window?.gon?.features?.monacoSnippets) { + editor = new Editor(); + editor.createInstance({ + el, + blobPath, + blobContent, + }); + } else { + editor = ace.edit(el); + } + + return editor; +} + +export default () => ({}); diff --git a/app/assets/javascripts/boards/components/issue_card_inner.vue b/app/assets/javascripts/boards/components/issue_card_inner.vue index 274565adab0..00da039c235 100644 --- a/app/assets/javascripts/boards/components/issue_card_inner.vue +++ b/app/assets/javascripts/boards/components/issue_card_inner.vue @@ -1,7 +1,7 @@ - - diff --git a/app/assets/javascripts/clusters_list/components/clusters.vue b/app/assets/javascripts/clusters_list/components/clusters.vue index 9322423370b..a1b581dc627 100644 --- a/app/assets/javascripts/clusters_list/components/clusters.vue +++ b/app/assets/javascripts/clusters_list/components/clusters.vue @@ -1,8 +1,9 @@ @@ -52,6 +63,25 @@ export default { variant="light" class="qa-clusters-table" > +