diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-03 17:37:00 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-03 17:37:00 +0000 |
| commit | b4045e997feae2043965706ae9f89ce6221a3792 (patch) | |
| tree | 41d9fc9aa03482c1297b2a96a0bad7ec5abd9f62 /app/views/groups | |
| parent | 651bdd7c34c9ebf686b8357d8fc3ca4d0a58792e (diff) | |
| parent | b8b3f919fd37abddf082e0af22bc28b0c3d7c1b2 (diff) | |
| download | gitlab-ce-b4045e997feae2043965706ae9f89ce6221a3792.tar.gz | |
Merge branch 'group-name-validation' into 'master'
Adds JavaScript validation for group path editing
## What does this MR do?
- Prevents group_edit form submission when special characters are included in the new group name
- Enhances gl_field_errors to support this use case and be more re-usable.
## Are there points in the code the reviewer needs to double check?
**The implementation of validation is here: https://gitlab.com/gitlab-org/gitlab-ce/commit/73d997046cac376ccdbcaac6f183002bc19b9a1f**
The rest of the diff for this MR is augmenting gl_field_errors
## Why was this MR needed?
- Currently we allow submission and a 500 error is returned.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23564, https://gitlab.com/gitlab-org/gitlab-ce/issues/19756, https://gitlab.com/gitlab-org/gitlab-ce/issues/19736, https://gitlab.com/gitlab-org/gitlab-ce/issues/23922
See merge request !7041
Diffstat (limited to 'app/views/groups')
| -rw-r--r-- | app/views/groups/edit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/new.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index f84ac37fa8f..2f90c19d4b4 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -2,7 +2,7 @@ .panel-heading Group settings .panel-body - = form_for @group, html: { multipart: true, class: "form-horizontal" }, authenticity_token: true do |f| + = form_for @group, html: { multipart: true, class: "form-horizontal gl-show-field-errors" }, authenticity_token: true do |f| = form_errors(@group) = render 'shared/group_form', f: f diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml index 2b8bc269e64..d19eaa6add9 100644 --- a/app/views/groups/new.html.haml +++ b/app/views/groups/new.html.haml @@ -5,7 +5,7 @@ New Group %hr -= form_for @group, html: { class: 'group-form form-horizontal' } do |f| += form_for @group, html: { class: 'group-form form-horizontal gl-show-field-errors' } do |f| = form_errors(@group) = render 'shared/group_form', f: f, autofocus: true |