summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2019-01-23 00:36:22 +0000
committerClement Ho <clemmakesapps@gmail.com>2019-01-23 00:36:22 +0000
commit5cf994043fbf8669120e52f7fc345f9168a0d77b (patch)
treefa58c396142b5f87dfb8908cfc6e74c1e802e66a
parent2fbbedbf30cac986e8d0a750b22f988f83b4d394 (diff)
parentdb4c85246dd42a1a8104be7b5a3b80a357915722 (diff)
downloadgitlab-ce-5cf994043fbf8669120e52f7fc345f9168a0d77b.tar.gz
Merge branch 'mg-fix-bad-cluster-update-entrypoint' into 'master'
Rename entrypoint for clusters update/edit page Closes #56715 See merge request gitlab-org/gitlab-ce!24583
-rw-r--r--app/assets/javascripts/pages/groups/clusters/edit/index.js (renamed from app/assets/javascripts/pages/groups/clusters/update/index.js)0
-rw-r--r--app/assets/javascripts/pages/projects/clusters/edit/index.js (renamed from app/assets/javascripts/pages/projects/clusters/update/index.js)0
-rw-r--r--changelogs/unreleased/mg-fix-bad-cluster-update-entrypoint.yml5
3 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/pages/groups/clusters/update/index.js b/app/assets/javascripts/pages/groups/clusters/edit/index.js
index 8001d2dd1da..8001d2dd1da 100644
--- a/app/assets/javascripts/pages/groups/clusters/update/index.js
+++ b/app/assets/javascripts/pages/groups/clusters/edit/index.js
diff --git a/app/assets/javascripts/pages/projects/clusters/update/index.js b/app/assets/javascripts/pages/projects/clusters/edit/index.js
index 8001d2dd1da..8001d2dd1da 100644
--- a/app/assets/javascripts/pages/projects/clusters/update/index.js
+++ b/app/assets/javascripts/pages/projects/clusters/edit/index.js
diff --git a/changelogs/unreleased/mg-fix-bad-cluster-update-entrypoint.yml b/changelogs/unreleased/mg-fix-bad-cluster-update-entrypoint.yml
new file mode 100644
index 00000000000..932850cc825
--- /dev/null
+++ b/changelogs/unreleased/mg-fix-bad-cluster-update-entrypoint.yml
@@ -0,0 +1,5 @@
+---
+title: Fix cluster page non-interactive on form validation error
+merge_request: 24583
+author:
+type: fixed