Commit f31d2aa4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

parents 16b8a1ef 98049a3e
...@@ -15,9 +15,8 @@ ...@@ -15,9 +15,8 @@
Create Merge Request Create Merge Request
- if current_user && current_user.private_token - if current_user && current_user.private_token
= link_to namespace_project_commits_path(@project.namespace, @project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed", class: 'prepend-left-10 btn' do = link_to namespace_project_commits_path(@project.namespace, @project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Commits Feed", class: 'prepend-left-10 btn' do
= icon("rss") = icon("rss")
Commits Feed
%ul.breadcrumb.repo-breadcrumb %ul.breadcrumb.repo-breadcrumb
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
.row .row
%section.col-md-8 %section.col-md-8
.header-with-avatar .header-with-avatar
= link_to avatar_icon(@user.email), target: '_blank' do = link_to avatar_icon(@user.email, 400), target: '_blank' do
= image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: '' = image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: ''
%h3 %h3
= @user.name = @user.name
......
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