Merge branch 'separate-activity' into 'master'

Re-use project partial for rendering explore projects from dashboard

For consistency with projects on dashboard after !1198

Before:

![Screenshot_2015-08-25_18.21.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/53bcf6909fe55b2e331ea6a720cb12ce/Screenshot_2015-08-25_18.21.48.png)

After:

![Screenshot_2015-08-25_18.20.22](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fbda93828ec28ef1ac874d65b4a04c2b/Screenshot_2015-08-25_18.20.22.png)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1200
This commit is contained in:
Dmitriy Zaporozhets 2015-08-25 16:54:54 +00:00
commit 7140e800ee
6 changed files with 11 additions and 39 deletions

View File

@ -1,24 +0,0 @@
%li
%h4.project-title
.project-access-icon
= visibility_level_icon(project.visibility_level)
= link_to project.name_with_namespace, [project.namespace.becomes(Namespace), project]
%span.pull-right
%i.fa.fa-star
= project.star_count
.project-info
- if project.description.present?
.project-description.str-truncated
= markdown(project.description, pipeline: :description)
.repo-info
- unless project.empty_repo?
= link_to pluralize(round_commit_count(project), 'commit'), namespace_project_commits_path(project.namespace, project, project.default_branch)
&middot;
= link_to pluralize(project.repository.branch_names.count, 'branch'), namespace_project_branches_path(project.namespace, project)
&middot;
= link_to pluralize(project.repository.tag_names.count, 'tag'), namespace_project_tags_path(project.namespace, project)
- else
%i.fa.fa-exclamation-triangle
Empty repository

View File

@ -0,0 +1,6 @@
%ul.projects-list.bordered-list.my-projects.public-projects
- projects.each do |project|
%li.project-row
= render partial: 'shared/project', locals: { project: project, avatar: true, stars: true }
- unless projects.present?
.nothing-here-block No such projects

View File

@ -4,10 +4,5 @@
.clearfix
= render 'filter'
%br
.public-projects
%ul.bordered-list.top-list
= render @projects
- unless @projects.present?
.nothing-here-block No public projects
= paginate @projects, theme: "gitlab"
= render 'projects', projects: @projects
= paginate @projects, theme: "gitlab"

View File

@ -7,8 +7,5 @@
See most starred projects
.pull-right
= render 'explore/projects/dropdown'
.public-projects
%ul.bordered-list
= render @starred_projects
= render 'projects', projects: @starred_projects
= paginate @starred_projects, theme: 'gitlab'

View File

@ -13,6 +13,4 @@
See most discussed projects for last month
.pull-right
= render 'explore/projects/dropdown'
.public-projects
%ul.bordered-list
= render @trending_projects
= render 'projects', projects: @trending_projects

View File

@ -34,7 +34,7 @@
%span.count= current_user.assigned_merge_requests.opened.count
= nav_link(controller: :snippets) do
= link_to (current_user ? user_snippets_path(current_user) : snippets_path), title: 'Your snippets', data: {placement: 'right'} do
= icon('dashboard fw')
= icon('clipboard fw')
%span
Snippets
- if current_user