diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-01 11:41:26 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-01 11:41:26 +0200 |
| commit | f31d2aa44d37683a0ff88c71f558f5faf87ebda2 (patch) | |
| tree | 525059ff4eebc7092c090fe2c633cb950396b83a /app | |
| parent | 16b8a1ef04490cff9cdb6d2d367ac4ceab526896 (diff) | |
| parent | 98049a3e0cab1b4ba4dafecffd5e1c9248620d8b (diff) | |
| download | gitlab-ce-f31d2aa44d37683a0ff88c71f558f5faf87ebda2.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/commits/show.html.haml | 3 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml index 9682100a54c..55054a31977 100644 --- a/app/views/projects/commits/show.html.haml +++ b/app/views/projects/commits/show.html.haml @@ -15,9 +15,8 @@ Create Merge Request - 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") - Commits Feed %ul.breadcrumb.repo-breadcrumb diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 15d53499e03..43d847831d6 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -9,7 +9,7 @@ .row %section.col-md-8 .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: '' %h3 = @user.name |