diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-29 13:04:41 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-29 13:04:41 +0000 |
| commit | 83ae38f6523c8628444de18e0a432349b6813909 (patch) | |
| tree | 9addfd9cfb8f896b9b0d905590141874f93e9c2b | |
| parent | 46def2045ec8ca560a7ba04cef3feac42c52e6cb (diff) | |
| parent | e488a4095f6c0b8901a796c17841e6eb03b06bbb (diff) | |
| download | gitlab-ce-83ae38f6523c8628444de18e0a432349b6813909.tar.gz | |
Merge branch 'highest-return-on-diff-investment' into 'master'
Bring back branches badge to main project page
Closes #34438
See merge request !12548
| -rw-r--r-- | app/views/projects/show.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/highest-return-on-diff-investment.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 7447197ed89..e1e70a53709 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -21,7 +21,7 @@ %li = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do #{n_('Commit', 'Commits', @project.statistics.commit_count)} (#{number_with_delimiter(@project.statistics.commit_count)}) - %l + %li = link_to namespace_project_branches_path(@project.namespace, @project) do #{n_('Branch', 'Branches', @repository.branch_count)} (#{number_with_delimiter(@repository.branch_count)}) %li diff --git a/changelogs/unreleased/highest-return-on-diff-investment.yml b/changelogs/unreleased/highest-return-on-diff-investment.yml new file mode 100644 index 00000000000..c8be1e0ff8f --- /dev/null +++ b/changelogs/unreleased/highest-return-on-diff-investment.yml @@ -0,0 +1,4 @@ +--- +title: Bring back branches badge to main project page +merge_request: 12548 +author: |