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

This commit is contained in:
Marin Jankovski 2014-05-22 11:06:59 +02:00
commit dc7158a0f9
2 changed files with 2 additions and 2 deletions

View file

@ -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

View file

@ -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 ...