From 5ff1b520badaa2da217416964709f49f3ede350a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 14 Oct 2019 09:07:54 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab-ci.yml | 2 +- .gitlab/ci/docs.gitlab-ci.yml | 6 +- .gitlab/ci/frontend.gitlab-ci.yml | 2 +- .gitlab/ci/global.gitlab-ci.yml | 4 +- Gemfile | 2 +- Gemfile.lock | 4 +- .../components/artifacts_list.vue | 40 +++++ .../components/artifacts_list_app.vue | 36 ++++ .../components/mr_collapsible_extension.vue | 81 +++++++++ .../mr_widget_pipeline_container.vue | 5 + .../stores/artifacts_list/actions.js | 74 ++++++++ .../stores/artifacts_list/getters.js | 16 ++ .../stores/artifacts_list/index.js | 16 ++ .../stores/artifacts_list/mutation_types.js | 5 + .../stores/artifacts_list/mutations.js | 22 +++ .../stores/artifacts_list/state.js | 8 + .../stores/mr_widget_store.js | 1 + app/views/help/ui.html.haml | 3 +- .../unreleased/15018-build-results-fe.yml | 5 + doc/administration/gitaly/index.md | 8 + doc/development/documentation/index.md | 32 ++-- doc/development/pipelines.md | 2 +- locale/gitlab.pot | 14 ++ scripts/trigger-build-docs | 10 +- .../components/artifacts_list_app_spec.js | 121 +++++++++++++ .../components/artifacts_list_spec.js | 61 +++++++ .../vue_mr_widget/components/mock_data.js | 15 ++ .../mr_collapsible_extension_spec.js | 105 +++++++++++ .../stores/artifacts_list/getters_spec.js | 32 ++++ .../stores/artifacts_list/mutations_spec.js | 78 +++++++++ .../mr_widget_pipeline_container_spec.js | 7 + spec/javascripts/vue_mr_widget/mock_data.js | 1 + .../stores/artifacts_list/actions_spec.js | 165 ++++++++++++++++++ 33 files changed, 948 insertions(+), 35 deletions(-) create mode 100644 app/assets/javascripts/vue_merge_request_widget/components/artifacts_list.vue create mode 100644 app/assets/javascripts/vue_merge_request_widget/components/artifacts_list_app.vue create mode 100644 app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue create mode 100644 app/assets/javascripts/vue_merge_request_widget/stores/artifacts_list/actions.js create mode 100644 app/assets/javascripts/vue_merge_request_widget/stores/artifacts_list/getters.js create mode 100644 app/assets/javascripts/vue_merge_request_widget/stores/artifacts_list/index.js create mode 100644 app/assets/javascripts/vue_merge_request_widget/stores/artifacts_list/mutation_types.js create mode 100644 app/assets/javascripts/vue_merge_request_widget/stores/artifacts_list/mutations.js create mode 100644 app/assets/javascripts/vue_merge_request_widget/stores/artifacts_list/state.js create mode 100644 changelogs/unreleased/15018-build-results-fe.yml create mode 100644 spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js create mode 100644 spec/frontend/vue_mr_widget/components/artifacts_list_spec.js create mode 100644 spec/frontend/vue_mr_widget/components/mock_data.js create mode 100644 spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js create mode 100644 spec/frontend/vue_mr_widget/stores/artifacts_list/getters_spec.js create mode 100644 spec/frontend/vue_mr_widget/stores/artifacts_list/mutations_spec.js create mode 100644 spec/javascripts/vue_mr_widget/stores/artifacts_list/actions_spec.js diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fdd4c2a64f6..ba840d1ced0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.33" +image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.33" stages: - prepare diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index 87023da3c24..008151f889f 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -14,10 +14,10 @@ variables: GIT_STRATEGY: none environment: - name: review-docs/$CI_COMMIT_REF_SLUG + name: review-docs/$DOCS_GITLAB_REPO_SUFFIX-$CI_MERGE_REQUEST_IID # DOCS_REVIEW_APPS_DOMAIN and DOCS_GITLAB_REPO_SUFFIX are CI variables # Discussion: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/14236/diffs#note_40140693 - url: http://$CI_ENVIRONMENT_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX + url: http://docs-preview-$DOCS_GITLAB_REPO_SUFFIX-$CI_MERGE_REQUEST_IID.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX on_stop: review-docs-cleanup before_script: # We don't clone the repo by using GIT_STRATEGY: none and only download the @@ -39,7 +39,7 @@ review-docs-deploy: review-docs-cleanup: extends: .review-docs environment: - name: review-docs/$CI_COMMIT_REF_SLUG + name: review-docs/$DOCS_GITLAB_REPO_SUFFIX-$CI_MERGE_REQUEST_IID action: stop script: - ./trigger-build-docs cleanup diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index adbfe2b4675..a3a2ab0691f 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -13,7 +13,7 @@ - .default-before_script - .assets-compile-cache - .only-code-qa-changes - image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker-18.06.1 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker-18.06.1 stage: test dependencies: ["setup-test-env"] needs: ["setup-test-env"] diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index 0c0591d3fdc..af7c7a0d152 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -123,7 +123,7 @@ - name: redis:alpine .use-pg10: - image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.33" + image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.33" services: - name: postgres:10.9 command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] @@ -137,7 +137,7 @@ - name: docker.elastic.co/elasticsearch/elasticsearch:5.6.12 .use-pg10-ee: - image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.33" + image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.33" services: - name: postgres:10.9 command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] diff --git a/Gemfile b/Gemfile index 460d161587d..920f778c053 100644 --- a/Gemfile +++ b/Gemfile @@ -465,7 +465,7 @@ gem 'lograge', '~> 0.5' gem 'grape_logging', '~> 1.7' # DNS Lookup -gem 'net-dns', '~> 0.9.0' +gem 'gitlab-net-dns', '~> 0.9.1' # Countries list gem 'countries', '~> 3.0' diff --git a/Gemfile.lock b/Gemfile.lock index c6828ecb2cd..4285cfac45e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -370,6 +370,7 @@ GEM redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) gitlab-markup (1.7.0) + gitlab-net-dns (0.9.1) gitlab-peek (0.0.1) railties (>= 4.0.0) gitlab-sidekiq-fetcher (0.5.2) @@ -596,7 +597,6 @@ GEM mustermann (~> 1.0.0) nakayoshi_fork (0.0.4) nap (1.1.0) - net-dns (0.9.0) net-ldap (0.16.0) net-ntp (2.1.3) net-ssh (5.2.0) @@ -1173,6 +1173,7 @@ DEPENDENCIES gitlab-labkit (~> 0.5) gitlab-license (~> 1.0) gitlab-markup (~> 1.7.0) + gitlab-net-dns (~> 0.9.1) gitlab-peek (~> 0.0.1) gitlab-sidekiq-fetcher (= 0.5.2) gitlab-styles (~> 2.7) @@ -1222,7 +1223,6 @@ DEPENDENCIES mini_magick minitest (~> 5.11.0) nakayoshi_fork (~> 0.0.4) - net-dns (~> 0.9.0) net-ldap net-ntp net-ssh (~> 5.2) diff --git a/app/assets/javascripts/vue_merge_request_widget/components/artifacts_list.vue b/app/assets/javascripts/vue_merge_request_widget/components/artifacts_list.vue new file mode 100644 index 00000000000..dc766176617 --- /dev/null +++ b/app/assets/javascripts/vue_merge_request_widget/components/artifacts_list.vue @@ -0,0 +1,40 @@ + + diff --git a/app/assets/javascripts/vue_merge_request_widget/components/artifacts_list_app.vue b/app/assets/javascripts/vue_merge_request_widget/components/artifacts_list_app.vue new file mode 100644 index 00000000000..730e67761be --- /dev/null +++ b/app/assets/javascripts/vue_merge_request_widget/components/artifacts_list_app.vue @@ -0,0 +1,36 @@ + + diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue new file mode 100644 index 00000000000..ae1d9368008 --- /dev/null +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue @@ -0,0 +1,81 @@ + + diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue index 8fdf61a6b8d..ffc3e0967d4 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue @@ -1,5 +1,6 @@