Add latest changes from gitlab-org/gitlab@master

17 files changed, 18 insertions, 20 deletions

diff --git a/app/assets/javascripts/pages/projects/releases/edit/index.js b/app/assets/javascripts/pages/projects/releases/edit/index.js
deleted file mode 100644
index c70271b09c4..00000000000
--- a/app/assets/javascripts/pages/projects/releases/edit/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import $ from 'jquery';
-import initForm from '~/pages/projects/init_form';
-
-document.addEventListener('DOMContentLoaded', () => initForm($('.release-form')));
diff --git a/app/assets/javascripts/pages/projects/releases/index/index.js b/app/assets/javascripts/pages/projects/releases/index/index.js
index c183fbb9610..6402023149f 100644
--- a/app/assets/javascripts/pages/projects/releases/index/index.js
+++ b/app/assets/javascripts/pages/projects/releases/index/index.js
@@ -1,3 +1,3 @@
-import initReleases from '~/releases';
+import initReleases from '~/releases/list';
 
 document.addEventListener('DOMContentLoaded', initReleases);
diff --git a/app/assets/javascripts/releases/components/app.vue b/app/assets/javascripts/releases/list/components/app.vue
index 5a06c4fec58..5a06c4fec58 100644
--- a/app/assets/javascripts/releases/components/app.vue
+++ b/app/assets/javascripts/releases/list/components/app.vue
diff --git a/app/assets/javascripts/releases/components/release_block.vue b/app/assets/javascripts/releases/list/components/release_block.vue
index 921ada91544..c9c5a6db303 100644
--- a/app/assets/javascripts/releases/components/release_block.vue
+++ b/app/assets/javascripts/releases/list/components/release_block.vue
@@ -5,7 +5,7 @@ import { GlTooltipDirective, GlLink, GlBadge } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';
 import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
-import { __, n__, sprintf } from '../../locale';
+import { __, n__, sprintf } from '~/locale';
 import { slugify } from '~/lib/utils/text_utility';
 import { getLocationHash } from '~/lib/utils/url_utility';
 import { scrollToElement } from '~/lib/utils/common_utils';
diff --git a/app/assets/javascripts/releases/index.js b/app/assets/javascripts/releases/list/index.js
index adbed3cb8e2..adbed3cb8e2 100644
--- a/app/assets/javascripts/releases/index.js
+++ b/app/assets/javascripts/releases/list/index.js
diff --git a/app/assets/javascripts/releases/store/actions.js b/app/assets/javascripts/releases/list/store/actions.js
index e0a922d5ef6..e0a922d5ef6 100644
--- a/app/assets/javascripts/releases/store/actions.js
+++ b/app/assets/javascripts/releases/list/store/actions.js
diff --git a/app/assets/javascripts/releases/store/index.js b/app/assets/javascripts/releases/list/store/index.js
index 968b94f0e0d..968b94f0e0d 100644
--- a/app/assets/javascripts/releases/store/index.js
+++ b/app/assets/javascripts/releases/list/store/index.js
diff --git a/app/assets/javascripts/releases/store/mutation_types.js b/app/assets/javascripts/releases/list/store/mutation_types.js
index a74bf15c515..a74bf15c515 100644
--- a/app/assets/javascripts/releases/store/mutation_types.js
+++ b/app/assets/javascripts/releases/list/store/mutation_types.js
diff --git a/app/assets/javascripts/releases/store/mutations.js b/app/assets/javascripts/releases/list/store/mutations.js
index b97dc6cb0ab..b97dc6cb0ab 100644
--- a/app/assets/javascripts/releases/store/mutations.js
+++ b/app/assets/javascripts/releases/list/store/mutations.js
diff --git a/app/assets/javascripts/releases/store/state.js b/app/assets/javascripts/releases/list/store/state.js
index bf25e651c99..bf25e651c99 100644
--- a/app/assets/javascripts/releases/store/state.js
+++ b/app/assets/javascripts/releases/list/store/state.js
diff --git a/doc/administration/high_availability/README.md b/doc/administration/high_availability/README.md
index d1d7af9f02e..56f375e7bbe 100644
--- a/doc/administration/high_availability/README.md
+++ b/doc/administration/high_availability/README.md
@@ -202,7 +202,9 @@ These reference architecture examples rely on the general rule that approximatel
 
 - **Supported Users (approximate):** 10,000
 - **RPS:** 200 requests per second
-- **Known Issues:** While validating the reference architecture, slow endpoints were discovered and are being investigated. [gitlab-org/gitlab-ce/issues/64335](https://gitlab.com/gitlab-org/gitlab-ce/issues/64335)
+- **Known Issues:** While validating the reference architecture, slow API endpoints
+  were discovered. For details, see the related issues list in
+  [this issue](https://gitlab.com/gitlab-org/gitlab-foss/issues/64335).
 
 The Support and Quality teams built, performance tested, and validated an
 environment that supports about 10,000 users. The specifications below are a
@@ -225,7 +227,7 @@ NOTE: **Note:** The specifications here were performance tested against a specif
 - **Supported Users (approximate):** 25,000
 - **RPS:** 500 requests per second
 - **Status:** Work-in-progress
-- **Related Issues:** [gitlab-org/quality/performance/issues/57](https://gitlab.com/gitlab-org/quality/performance/issues/57)
+- **Related Issue:** See the [related issue](https://gitlab.com/gitlab-org/quality/performance/issues/57) for more information.
 
 The Support and Quality teams are in the process of building and performance testing
 an environment that will support about 25,000 users. The specifications below
@@ -240,7 +242,7 @@ TBD: Add specs
 - **Supported Users (approximate):** 50,000
 - **RPS:** 1,000 requests per second
 - **Status:** Work-in-progress
-- **Related Issues:** [gitlab-org/quality/performance/issues/66](https://gitlab.com/gitlab-org/quality/performance/issues/66)
+- **Related Issue:** See the [related issue](https://gitlab.com/gitlab-org/quality/performance/issues/66) for more information.
 
 The Support and Quality teams are in the process of building and performance testing
 an environment that will support about 50,000 users. The specifications below
diff --git a/doc/administration/high_availability/database.md b/doc/administration/high_availability/database.md
index 61f5c775125..ea97ada6e2f 100644
--- a/doc/administration/high_availability/database.md
+++ b/doc/administration/high_availability/database.md
@@ -708,7 +708,7 @@ After deploying the configuration follow these steps:
 This example uses 3 PostgreSQL servers, and 1 application node.
 
 It differs from the [recommended setup](#example-recommended-setup) by moving the Consul servers into the same servers we use for PostgreSQL.
-The trade-off is between reducing server counts, against the increased operational complexity of needing to deal with postgres [failover](#failover-procedure) and [restore](#restore-procedure) procedures in addition to [Consul outage recovery](consul.md#outage-recovery) on the same set of machines.
+The trade-off is between reducing server counts, against the increased operational complexity of needing to deal with PostgreSQL [failover](#failover-procedure) and [restore](#restore-procedure) procedures in addition to [Consul outage recovery](consul.md#outage-recovery) on the same set of machines.
 
 In this example we start with all servers on the same 10.6.0.0/16 private network range, they can connect to each freely other on those addresses.
 
diff --git a/spec/frontend/releases/components/release_block_spec.js b/spec/frontend/releases/components/release_block_spec.js
index 1f5da093902..1327db02ae1 100644
--- a/spec/frontend/releases/components/release_block_spec.js
+++ b/spec/frontend/releases/components/release_block_spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils';
-import ReleaseBlock from '~/releases/components/release_block.vue';
+import ReleaseBlock from '~/releases/list/components/release_block.vue';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
 import { first } from 'underscore';
 import { release } from '../mock_data';
diff --git a/spec/javascripts/releases/components/app_spec.js b/spec/javascripts/releases/components/app_spec.js
index f30c7685e34..4fc04e401f2 100644
--- a/spec/javascripts/releases/components/app_spec.js
+++ b/spec/javascripts/releases/components/app_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import app from '~/releases/components/app.vue';
-import createStore from '~/releases/store';
+import app from '~/releases/list/components/app.vue';
+import createStore from '~/releases/list/store';
 import api from '~/api';
 import { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
 import { resetStore } from '../store/helpers';
diff --git a/spec/javascripts/releases/store/actions_spec.js b/spec/javascripts/releases/store/actions_spec.js
index 6eb8e681be9..95fd1aa85ec 100644
--- a/spec/javascripts/releases/store/actions_spec.js
+++ b/spec/javascripts/releases/store/actions_spec.js
@@ -3,9 +3,9 @@ import {
   fetchReleases,
   receiveReleasesSuccess,
   receiveReleasesError,
-} from '~/releases/store/actions';
-import state from '~/releases/store/state';
-import * as types from '~/releases/store/mutation_types';
+} from '~/releases/list/store/actions';
+import state from '~/releases/list/store/state';
+import * as types from '~/releases/list/store/mutation_types';
 import api from '~/api';
 import testAction from 'spec/helpers/vuex_action_helper';
 import { releases } from '../mock_data';
diff --git a/spec/javascripts/releases/store/helpers.js b/spec/javascripts/releases/store/helpers.js
index e962b254377..fbc89ec2148 100644
--- a/spec/javascripts/releases/store/helpers.js
+++ b/spec/javascripts/releases/store/helpers.js
@@ -1,4 +1,4 @@
-import state from '~/releases/store/state';
+import state from '~/releases/list/store/state';
 
 // eslint-disable-next-line import/prefer-default-export
 export const resetStore = store => {
diff --git a/spec/javascripts/releases/store/mutations_spec.js b/spec/javascripts/releases/store/mutations_spec.js
index 72b98529fe9..3338f840bbe 100644
--- a/spec/javascripts/releases/store/mutations_spec.js
+++ b/spec/javascripts/releases/store/mutations_spec.js
@@ -1,6 +1,6 @@
-import state from '~/releases/store/state';
-import mutations from '~/releases/store/mutations';
-import * as types from '~/releases/store/mutation_types';
+import state from '~/releases/list/store/state';
+import mutations from '~/releases/list/store/mutations';
+import * as types from '~/releases/list/store/mutation_types';
 import { releases } from '../mock_data';
 
 describe('Releases Store Mutations', () => {