diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-11 19:44:05 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-20 00:14:58 -0500 |
| commit | 3b75d65bd3e1bb53b0ce9755323b30221d6a4649 (patch) | |
| tree | 60c88e093eaabf432e186c853d89ed9dcfae8feb /app | |
| parent | b2e5b57fab4d73a5ad043d82457268fdb3864a89 (diff) | |
| download | gitlab-ce-3b75d65bd3e1bb53b0ce9755323b30221d6a4649.tar.gz | |
Show forks counter on listing. #2406
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/forks/index.html.haml | 3 | ||||
| -rw-r--r-- | app/views/shared/projects/_list.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/projects/_project.html.haml | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/app/views/projects/forks/index.html.haml b/app/views/projects/forks/index.html.haml index d050b2f735a..46ec7a5d22a 100644 --- a/app/views/projects/forks/index.html.haml +++ b/app/views/projects/forks/index.html.haml @@ -15,7 +15,8 @@ == #{pluralize(@all_forks.size, 'fork')}: #{full_count_title} .projects-list-holder - = render 'shared/projects/list', projects: @public_forks, use_creator_avatar: true + = render 'shared/projects/list', projects: @public_forks, use_creator_avatar: true, + forks: true - if protected_count > 0 %ul.projects-list diff --git a/app/views/shared/projects/_list.html.haml b/app/views/shared/projects/_list.html.haml index c0a7b9f08fa..0c774d217c3 100644 --- a/app/views/shared/projects/_list.html.haml +++ b/app/views/shared/projects/_list.html.haml @@ -2,6 +2,7 @@ - avatar = true unless local_assigns[:avatar] == false - use_creator_avatar = false unless local_assigns[:use_creator_avatar] == true - stars = true unless local_assigns[:stars] == false +- forks = false unless local_assigns[:forks] == true - ci = false unless local_assigns[:ci] == true - skip_namespace = false unless local_assigns[:skip_namespace] == true @@ -9,7 +10,8 @@ - projects.each_with_index do |project, i| - css_class = (i >= projects_limit) ? 'hide' : nil = render "shared/projects/project", project: project, skip_namespace: skip_namespace, - avatar: avatar, stars: stars, css_class: css_class, ci: ci, use_creator_avatar: use_creator_avatar + avatar: avatar, stars: stars, css_class: css_class, ci: ci, use_creator_avatar: use_creator_avatar, + forks: forks - if projects.size > projects_limit %li.bottom.center diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index 9bf45d3ce33..96ecb9dadb6 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -1,5 +1,6 @@ - avatar = true unless local_assigns[:avatar] == false - stars = true unless local_assigns[:stars] == false +- forks = false unless local_assigns[:forks] == true - ci = false unless local_assigns[:ci] == true - skip_namespace = false unless local_assigns[:skip_namespace] == true - css_class = '' unless local_assigns[:css_class] @@ -29,6 +30,10 @@ - if ci_commit = render_ci_status(ci_commit) + - if forks + %span + %i.fa.fa-code-fork + = project.forks_count - if stars %span %i.fa.fa-star |