diff options
author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-01-17 16:29:11 +0000 |
---|---|---|
committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-01-17 16:29:11 +0000 |
commit | 8c7c5ebcb8863a144555205003e4f17cb48da06d (patch) | |
tree | 6a36019d1cd177016250a04a20e308fe29a8c5b2 | |
parent | f1b9a9cb28209d5cacd0e7a4b9132dab7900dcf7 (diff) | |
parent | b65f3c9fa0acbf48d8d6c8f92b58bd85ddf6c646 (diff) | |
download | gitlab-ce-8c7c5ebcb8863a144555205003e4f17cb48da06d.tar.gz |
Merge branch '10-4-stable-prepare-rc7' of https://gitlab.com/gitlab-org/gitlab-ce into 10-4-stable-prepare-rc7
-rw-r--r-- | app/views/projects/forks/index.html.haml | 4 | ||||
-rw-r--r-- | app/views/shared/projects/_project.html.haml | 2 | ||||
-rw-r--r-- | changelogs/unreleased/42046-fork-icon.yml | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/app/views/projects/forks/index.html.haml b/app/views/projects/forks/index.html.haml index 111cbcda266..21a4702a2a9 100644 --- a/app/views/projects/forks/index.html.haml +++ b/app/views/projects/forks/index.html.haml @@ -31,11 +31,11 @@ - if current_user && can?(current_user, :fork_project, @project) - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2 = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn btn-new' do - = custom_icon('icon_fork') + = sprite_icon('fork', size: 12) %span Fork - else = link_to new_project_fork_path(@project), title: "Fork project", class: 'btn btn-new' do - = custom_icon('icon_fork') + = sprite_icon('fork', size: 12) %span Fork diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index 63aa4e29ec9..2a75b46d376 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -52,7 +52,7 @@ = render_project_pipeline_status(project.pipeline_status) - if forks %span.prepend-left-10 - = sprite_icon('fork') + = sprite_icon('fork', size: 12) = number_with_delimiter(project.forks_count) - if stars %span.prepend-left-10 diff --git a/changelogs/unreleased/42046-fork-icon.yml b/changelogs/unreleased/42046-fork-icon.yml new file mode 100644 index 00000000000..def89ff7b08 --- /dev/null +++ b/changelogs/unreleased/42046-fork-icon.yml @@ -0,0 +1,5 @@ +--- +title: Fix giant fork icons on forks page +merge_request: 16474 +author: +type: fixed |