summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2017-08-23 16:55:53 +0000
committerClement Ho <clemmakesapps@gmail.com>2017-08-23 16:55:53 +0000
commit99bb3dde251d127fb897eb01fcade7c7f3d8c063 (patch)
treeeddf82ad33d3f2de0ccd66f85a9192d7ce9010fd
parent45e816c798901e514cb551542e6c05f91485bd3d (diff)
parent3611b664a94635e950c9d281bbbc8e2360a56fa3 (diff)
downloadgitlab-ce-99bb3dde251d127fb897eb01fcade7c7f3d8c063.tar.gz
Merge branch 'zj-fix-fe-blank-button' into 'master'
Fix blank button not resetting project template value Closes #36816 See merge request !13757
-rw-r--r--app/views/projects/_project_templates.html.haml2
-rw-r--r--changelogs/unreleased/zj-fix-fe-blank-button.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/_project_templates.html.haml b/app/views/projects/_project_templates.html.haml
index 97cf13df070..5638b7da1b0 100644
--- a/app/views/projects/_project_templates.html.haml
+++ b/app/views/projects/_project_templates.html.haml
@@ -1,6 +1,6 @@
.project-templates-buttons.import-buttons{ data: { toggle: "buttons" } }
.btn.blank-option.active
- %input{ type: "radio", autocomplete: "off", name: "project_templates", id: "blank", checked: "true" }
+ %input{ type: "radio", autocomplete: "off", name: "project[template_name]", id: "blank", checked: "true", value: "" }
= icon('file-o', class: 'btn-template-icon')
Blank
- Gitlab::ProjectTemplate.all.each do |template|
diff --git a/changelogs/unreleased/zj-fix-fe-blank-button.yml b/changelogs/unreleased/zj-fix-fe-blank-button.yml
new file mode 100644
index 00000000000..2165d4186c1
--- /dev/null
+++ b/changelogs/unreleased/zj-fix-fe-blank-button.yml
@@ -0,0 +1,5 @@
+---
+title: Fix new project form not resetting the template value
+merge_request:
+author:
+type: fixed