diff options
| author | Hiroyuki Sato <sathiroyuki@gmail.com> | 2017-07-23 21:26:02 +0900 |
|---|---|---|
| committer | Hiroyuki Sato <sathiroyuki@gmail.com> | 2017-07-23 21:26:02 +0900 |
| commit | 9b25bbc45d4e6602452e230506601ff0ed8ba84a (patch) | |
| tree | 95f7326e4162a325a5e7c7304c33f18194b52cbe /app/views/admin/groups/index.html.haml | |
| parent | 839018d2d4e3e899b1fa06a43d093a0fdceced42 (diff) | |
| parent | b92d5135d8522e1370636799d74b51f9a37d0b2f (diff) | |
| download | gitlab-ce-9b25bbc45d4e6602452e230506601ff0ed8ba84a.tar.gz | |
Merge branch 'master' into 1827-prevent-concurrent-editing-wiki
Conflicts:
app/controllers/projects/wikis_controller.rb
app/views/projects/wikis/edit.html.haml
spec/features/projects/wiki/user_updates_wiki_page_spec.rb
Diffstat (limited to 'app/views/admin/groups/index.html.haml')
| -rw-r--r-- | app/views/admin/groups/index.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml index 07775247cfd..e5f380c78e2 100644 --- a/app/views/admin/groups/index.html.haml +++ b/app/views/admin/groups/index.html.haml @@ -30,7 +30,7 @@ = link_to admin_groups_path(sort: sort_value_largest_group, name: project_name) do = sort_title_largest_group = link_to new_admin_group_path, class: "btn btn-new" do - New Group + New group %ul.content-list = render @groups |