Commit dc7158a0 authored by Marin Jankovski's avatar Marin Jankovski

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

parents b019c061 66dfe37d
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
New project New project
%ul.well-list %ul.well-list
- if projects.blank? - 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| - projects.each do |project|
%li.project-row %li.project-row
= link_to project_path(project), class: dom_class(project) do = link_to project_path(project), class: dom_class(project) do
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
- if @group.avatar? - if @group.avatar?
You can change your group avatar here You can change your group avatar here
- else - 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 %a.choose-btn.btn.btn-small.js-choose-group-avatar-button
%i.icon-paper-clip %i.icon-paper-clip
%span Choose File ... %span Choose File ...
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment