diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-03-17 17:32:57 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-03-17 17:32:57 +0000 |
| commit | 745aad4196fa5217f682af472006e8a01bb1ecea (patch) | |
| tree | 9c705c02071ec122b5a9341049df0058af5cad5f | |
| parent | 94238a9a7d926ae46579234cd4e07e2a3e7ce426 (diff) | |
| parent | 6a269450e6b8443a6a15b8ba6e0fe6737c78bd5b (diff) | |
| download | gitlab-ce-745aad4196fa5217f682af472006e8a01bb1ecea.tar.gz | |
Merge branch 'fix_service_trigger_ui' into 'master'
Fix service UI
There was a small bug in the service UI that caused an empty 'Trigger' label to be shown. After this change the 'Trigger' field is not shown when only one event type of supported.
Before:
I think in the future there are other things we can do to enforce at least one selected event type and also show the user what the singular event type is if only one is supported. That will take time to work out and this is definitely acceptable for the time.
See merge request !395
| -rw-r--r-- | app/views/admin/services/_form.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/services/_form.html.haml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/views/admin/services/_form.html.haml b/app/views/admin/services/_form.html.haml index 291e48efc12..a953833b37c 100644 --- a/app/views/admin/services/_form.html.haml +++ b/app/views/admin/services/_form.html.haml @@ -14,9 +14,9 @@ = preserve do = markdown @service.help - .form-group - = f.label :url, "Trigger", class: 'control-label' - - if @service.supported_events.length > 1 + - if @service.supported_events.length > 1 + .form-group + = f.label :url, "Trigger", class: 'control-label' .col-sm-10 - if @service.supported_events.include?("push") %div diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index 3492dd5babd..bb983229b1c 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -27,9 +27,9 @@ .col-sm-10 = f.check_box :active - .form-group - = f.label :url, "Trigger", class: 'control-label' - - if @service.supported_events.length > 1 + - if @service.supported_events.length > 1 + .form-group + = f.label :url, "Trigger", class: 'control-label' .col-sm-10 - if @service.supported_events.include?("push") %div |