diff options
| author | James Lopez <james@jameslopez.es> | 2016-01-29 14:27:10 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-01-29 14:27:10 +0100 |
| commit | 7ca6779654ed2da5ba31ab9256406feb1b7fb8ee (patch) | |
| tree | 8c3d1e2eb642b667c9e46babdc786a4d4dc3c789 /app/views/admin/groups | |
| parent | 4d2da5fd2585fead823c4450e54613dadf882c0d (diff) | |
| parent | f5860ce6466bf8934bc01254351bffd005dfeafe (diff) | |
| download | gitlab-ce-7ca6779654ed2da5ba31ab9256406feb1b7fb8ee.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue
Diffstat (limited to 'app/views/admin/groups')
| -rw-r--r-- | app/views/admin/groups/_form.html.haml | 3 | ||||
| -rw-r--r-- | app/views/admin/groups/index.html.haml | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index 8de2ba74a79..198026a1f75 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -21,6 +21,5 @@ - else .form-actions - = f.submit 'Save changes', class: "btn btn-primary" + = f.submit 'Save changes', class: "btn btn-save" = link_to 'Cancel', admin_group_path(@group), class: "btn btn-cancel" - diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml index 3940210e19b..118d3cfea07 100644 --- a/app/views/admin/groups/index.html.haml +++ b/app/views/admin/groups/index.html.haml @@ -17,7 +17,7 @@ .pull-right .dropdown.inline %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"} - %span.light sort: + %span.light - if @sort.present? = sort_options_hash[@sort] - else |