diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-05-22 11:06:59 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-05-22 11:06:59 +0200 |
| commit | dc7158a0f9ed29171451cc04441e90a540e4952c (patch) | |
| tree | e2226f317456a7f0932adb15199dc6504f41d84a | |
| parent | b019c06195cf3ca3e097f57c53cbd863165fa077 (diff) | |
| parent | 66dfe37d413049b8bf1492ff17e12a207f7a24e7 (diff) | |
| download | gitlab-ce-dc7158a0f9ed29171451cc04441e90a540e4952c.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
| -rw-r--r-- | app/views/groups/_projects.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/edit.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml index bd4e3156af0..41f8cb9da40 100644 --- a/app/views/groups/_projects.html.haml +++ b/app/views/groups/_projects.html.haml @@ -8,7 +8,7 @@ New project %ul.well-list - if projects.blank? - .nothing-here-block This groups has no projects yet + .nothing-here-block This group has no projects yet - projects.each do |project| %li.project-row = link_to project_path(project), class: dom_class(project) do diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 500c37ab71d..2a5614cff6c 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -45,7 +45,7 @@ - if @group.avatar? You can change your group avatar here - else - You can upload an group avatar here + You can upload a group avatar here %a.choose-btn.btn.btn-small.js-choose-group-avatar-button %i.icon-paper-clip %span Choose File ... |