Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
8734a9cd
Commit
8734a9cd
authored
Jul 26, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'most-starred' into 'master'
Most starred projects page Fixes #1461 See merge request !996
parents
76af5a1d
d3ea5387
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
50 additions
and
3 deletions
+50
-3
app/controllers/explore/projects_controller.rb
app/controllers/explore/projects_controller.rb
+6
-0
app/views/explore/projects/_project.html.haml
app/views/explore/projects/_project.html.haml
+5
-0
app/views/explore/projects/starred.html.haml
app/views/explore/projects/starred.html.haml
+10
-0
app/views/layouts/explore.html.haml
app/views/layouts/explore.html.haml
+2
-0
config/routes.rb
config/routes.rb
+1
-0
features/explore/projects.feature
features/explore/projects.feature
+14
-0
features/steps/shared/paths.rb
features/steps/shared/paths.rb
+7
-3
features/steps/shared/project.rb
features/steps/shared/project.rb
+5
-0
No files found.
app/controllers/explore/projects_controller.rb
View file @
8734a9cd
...
...
@@ -16,4 +16,10 @@ class Explore::ProjectsController < ApplicationController
@trending_projects
=
TrendingProjectsFinder
.
new
.
execute
(
current_user
)
@trending_projects
=
@trending_projects
.
page
(
params
[
:page
]).
per
(
10
)
end
def
starred
@starred_projects
=
ProjectsFinder
.
new
.
execute
(
current_user
)
@starred_projects
=
@starred_projects
.
order
(
'star_count DESC'
)
@starred_projects
=
@starred_projects
.
page
(
params
[
:page
]).
per
(
10
)
end
end
app/views/explore/projects/_project.html.haml
View file @
8734a9cd
...
...
@@ -4,6 +4,10 @@
=
visibility_level_icon
(
project
.
visibility_level
)
=
link_to
project
.
name_with_namespace
,
project
-
if
current_page?
(
starred_explore_projects_path
)
%strong
.pull-right
=
pluralize
project
.
star_count
,
'star'
-
if
project
.
description
.
present?
%p
.project-description.str-truncated
=
project
.
description
...
...
@@ -18,3 +22,4 @@
-
else
%i
.icon-warning-sign
Empty repository
app/views/explore/projects/starred.html.haml
0 → 100644
View file @
8734a9cd
.explore-trending-block
%p
.lead
%i
.icon-comments-alt
See most starred projects
%hr
.public-projects
%ul
.bordered-list
=
render
@starred_projects
=
paginate
@starred_projects
,
theme:
'gitlab'
app/views/layouts/explore.html.haml
View file @
8734a9cd
...
...
@@ -20,6 +20,8 @@
%ul
.nav.nav-tabs
=
nav_link
(
path:
'projects#trending'
)
do
=
link_to
'Trending Projects'
,
explore_root_path
=
nav_link
(
path:
'projects#starred'
)
do
=
link_to
'Most Starred Projects'
,
starred_explore_projects_path
=
nav_link
(
path:
'projects#index'
)
do
=
link_to
'All Projects'
,
explore_projects_path
=
nav_link
(
controller: :groups
)
do
...
...
config/routes.rb
View file @
8734a9cd
...
...
@@ -53,6 +53,7 @@ Gitlab::Application.routes.draw do
resources
:projects
,
only:
[
:index
]
do
collection
do
get
:trending
get
:starred
end
end
...
...
features/explore/projects.feature
View file @
8734a9cd
...
...
@@ -100,3 +100,17 @@ Feature: Explore Projects Feature
And
I visit
"Internal"
merge requests page
And
project
"Internal"
has
"Feature implemented"
open merge request
Then
I should see list of merge requests for
"Internal"
project
Scenario
:
Trending page
Given
I sign in as a user
And
project
"Community"
has comments
When
I visit the explore trending projects
Then
I should see project
"Community"
And
I should not see project
"Internal"
And
I should not see project
"Enterprise"
Scenario
:
Most starred page
Given
I sign in as a user
When
I visit the explore starred projects
Then
I should see project
"Community"
And
I should see project
"Internal"
features/steps/shared/paths.rb
View file @
8734a9cd
...
...
@@ -355,9 +355,13 @@ module SharedPaths
visit
explore_projects_path
end
# ----------------------------------------
# Public Groups
# ----------------------------------------
step
'I visit the explore trending projects'
do
visit
trending_explore_projects_path
end
step
'I visit the explore starred projects'
do
visit
starred_explore_projects_path
end
step
'I visit the public groups area'
do
visit
explore_groups_path
...
...
features/steps/shared/project.rb
View file @
8734a9cd
...
...
@@ -130,4 +130,9 @@ module SharedProject
step
'public empty project "Empty Public Project"'
do
create
:empty_project
,
:public
,
name:
"Empty Public Project"
end
step
'project "Community" has comments'
do
project
=
Project
.
find_by
(
name:
"Community"
)
2
.
times
{
create
(
:note_on_issue
,
project:
project
)
}
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment