diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-28 21:46:56 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-28 21:46:56 +0000 |
commit | 795199bf04ca08521112d89c03df31d1c11e335d (patch) | |
tree | 1fb0654822ec8b25bb5a0231e9c13830183d9576 | |
parent | d73e1288595ef673b2d9c3024d7fe3909dac7184 (diff) | |
parent | ff29d88dbeea92ce24421dd563424fc5b4a969af (diff) | |
download | gitlab-ce-795199bf04ca08521112d89c03df31d1c11e335d.tar.gz |
Merge branch 'add_link_to_fork_counter_button' into 'master'
Add link to forks pages in fork counter button
closes #14412
![fork_link](/uploads/5afef05bc592b0cf1c90ae4d154aed87/fork_link.gif)
See merge request !3387
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 2 | ||||
-rw-r--r-- | app/views/projects/buttons/_fork.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index ee7c6a3d55f..4e6aa8cd1a6 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -162,7 +162,7 @@ margin-right: 12px; a { - margin: -1px !important; + margin: -1px; } } diff --git a/app/views/projects/buttons/_fork.html.haml b/app/views/projects/buttons/_fork.html.haml index 88cbb7c03c5..5fb5fe5af2f 100644 --- a/app/views/projects/buttons/_fork.html.haml +++ b/app/views/projects/buttons/_fork.html.haml @@ -12,7 +12,7 @@ = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn has-tooltip' do = icon('code-fork fw') Fork - %div.count-with-arrow + = link_to namespace_project_forks_path(@project.namespace, @project), class: 'count-with-arrow' do %span.arrow %span.count = @project.forks_count |