Download as
Browse Code »

Commit dc7158a0f9ed29171451cc04441e90a540e4952c

Authored by Marin Jankovski
2 parents b019c061 66dfe37d
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/views/groups/_projects.html.haml
  Diff comments   View file @dc7158a
... ... @@ -8,7 +8,7 @@
8 8 New project
9 9 %ul.well-list
10 10 - if projects.blank?
11   - .nothing-here-block This groups has no projects yet
  11 + .nothing-here-block This group has no projects yet
12 12 - projects.each do |project|
13 13 %li.project-row
14 14 = link_to project_path(project), class: dom_class(project) do
... ...
app/views/groups/edit.html.haml
  Diff comments   View file @dc7158a
... ... @@ -45,7 +45,7 @@
45 45 - if @group.avatar?
46 46 You can change your group avatar here
47 47 - else
48   - You can upload an group avatar here
  48 + You can upload a group avatar here
49 49 %a.choose-btn.btn.btn-small.js-choose-group-avatar-button
50 50 %i.icon-paper-clip
51 51 %span Choose File ...
... ...