diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-25 08:46:51 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-25 08:46:51 +0000 |
| commit | 20209565c7e6b6ff1d17c3f547909f81585d0cab (patch) | |
| tree | 93edff955d6a8380b93b53b34b0b8e9f53b7ea94 | |
| parent | d8e38de9694b69e9ad6cdaa1ba4dc0854c562a2f (diff) | |
| parent | 3992981ee45406be04a5fa8822c30e2f6d6512da (diff) | |
| download | gitlab-ce-20209565c7e6b6ff1d17c3f547909f81585d0cab.tar.gz | |
Merge branch 'fork-counter-link' into 'master'
Make fork counter always clickable
## What does this MR do?
Make the fork counter on project pages clickable for people who forked the project.
## Why was this MR needed?
The fork counter was not clickable.
## What are the relevant issue numbers?
fixes #20205
See merge request !5463
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/buttons/_fork.html.haml | 12 |
2 files changed, 5 insertions, 8 deletions
diff --git a/CHANGELOG b/CHANGELOG index c220926239a..700d6e37cd7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ v 8.11.0 (unreleased) - Fix of 'Commits being passed to custom hooks are already reachable when using the UI' - Limit git rev-list output count to one in forced push check - Retrieve rendered HTML from cache in one request + - Make fork counter always clickable !5463 (winniehell) - Load project invited groups and members eagerly in ProjectTeam#fetch_members - Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska) diff --git a/app/views/projects/buttons/_fork.html.haml b/app/views/projects/buttons/_fork.html.haml index a098a082854..d78888e9fe4 100644 --- a/app/views/projects/buttons/_fork.html.haml +++ b/app/views/projects/buttons/_fork.html.haml @@ -4,15 +4,11 @@ = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn has-tooltip' do = custom_icon('icon_fork') Fork - %div.count-with-arrow - %span.arrow - %span.count - = @project.forks_count - else = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn has-tooltip' do = custom_icon('icon_fork') Fork - %div.count-with-arrow - %span.arrow - = link_to namespace_project_forks_path(@project.namespace, @project), class: "count" do - = @project.forks_count + %div.count-with-arrow + %span.arrow + = link_to namespace_project_forks_path(@project.namespace, @project), class: "count" do + = @project.forks_count |