summaryrefslogtreecommitdiff
path: root/app/views/admin/labels
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-04-11 12:01:50 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-04-11 12:01:50 +0000
commit5999fec7a3aa7f663d0ade254e37fda3391fa17a (patch)
tree11ab4556b1e36b9820f860046929ef3164daa48d /app/views/admin/labels
parent1794e934ce44b5058be598c2da43172bf80aac16 (diff)
parent7a2370f74060b2f065e3602700fe1b33fda4685c (diff)
downloadgitlab-ce-5999fec7a3aa7f663d0ade254e37fda3391fa17a.tar.gz
Merge branch 'rs-form_errors' into 'master'
Standardize the way we check for and display form errors - Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard. See merge request !3531
Diffstat (limited to 'app/views/admin/labels')
-rw-r--r--app/views/admin/labels/_form.html.haml8
1 files changed, 1 insertions, 7 deletions
diff --git a/app/views/admin/labels/_form.html.haml b/app/views/admin/labels/_form.html.haml
index 8c6b389bf15..448aa953548 100644
--- a/app/views/admin/labels/_form.html.haml
+++ b/app/views/admin/labels/_form.html.haml
@@ -1,11 +1,5 @@
= form_for [:admin, @label], html: { class: 'form-horizontal label-form js-requires-input' } do |f|
- -if @label.errors.any?
- .row
- .col-sm-offset-2.col-sm-10
- .alert.alert-danger
- - @label.errors.full_messages.each do |msg|
- %span= msg
- %br
+ = form_errors(@label)
.form-group
= f.label :title, class: 'control-label'