diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-09-20 00:09:57 -0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-10-19 14:58:24 -0200 |
| commit | bdb7bf4b5188ffd68e54cbf671ba9ce1a4ffb1d1 (patch) | |
| tree | 3f53930ff56ab0cfeceb0ab3af75fe9b75fefebd /app/views/groups | |
| parent | bf9d928b45516e716b0f7f099361ca03aa1454f8 (diff) | |
| download | gitlab-ce-bdb7bf4b5188ffd68e54cbf671ba9ce1a4ffb1d1.tar.gz | |
List group labels on project labels page
Diffstat (limited to 'app/views/groups')
| -rw-r--r-- | app/views/groups/labels/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/labels/_label.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/groups/labels/_form.html.haml b/app/views/groups/labels/_form.html.haml index 008b5fb9ba1..a0b44b0dcfb 100644 --- a/app/views/groups/labels/_form.html.haml +++ b/app/views/groups/labels/_form.html.haml @@ -30,4 +30,4 @@ = f.submit 'Save changes', class: 'btn btn-save js-save-button' - else = f.submit 'Create Label', class: 'btn btn-create js-save-button' - = link_to "Cancel", group_labels_path(@group), class: 'btn btn-cancel' + = link_to 'Cancel', @previous_labels_path, class: 'btn btn-cancel' diff --git a/app/views/groups/labels/_label.html.haml b/app/views/groups/labels/_label.html.haml index b9aab76f057..9faf90c303e 100644 --- a/app/views/groups/labels/_label.html.haml +++ b/app/views/groups/labels/_label.html.haml @@ -1,6 +1,6 @@ - label_css_id = dom_id(label) - open_issues_count = label.open_issues_count(current_user) -- open_merge_requests_count = label.open_merge_requests_count +- open_merge_requests_count = label.open_merge_requests_count(current_user) %li{id: label_css_id, data: { id: label.id } } = render 'label_row', label: label |