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
Léo-Paul Géneau
gitlab-ce
Commits
0414b2ae
Commit
0414b2ae
authored
Mar 10, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove projects page from dashboard
parent
83f7e98d
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
0 additions
and
108 deletions
+0
-108
app/controllers/dashboard_controller.rb
app/controllers/dashboard_controller.rb
+0
-22
app/views/dashboard/projects.html.haml
app/views/dashboard/projects.html.haml
+0
-60
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+0
-5
config/routes.rb
config/routes.rb
+0
-1
features/dashboard/projects.feature
features/dashboard/projects.feature
+0
-9
features/steps/dashboard/projects.rb
features/steps/dashboard/projects.rb
+0
-11
No files found.
app/controllers/dashboard_controller.rb
View file @
0414b2ae
...
...
@@ -23,28 +23,6 @@ class DashboardController < ApplicationController
end
end
def
projects
@projects
=
case
params
[
:scope
]
when
'personal'
then
current_user
.
namespace
.
projects
when
'joined'
then
current_user
.
authorized_projects
.
joined
(
current_user
)
when
'owned'
then
current_user
.
owned_projects
else
current_user
.
authorized_projects
end
@projects
=
@projects
.
where
(
namespace_id:
Group
.
find_by
(
name:
params
[
:group
]))
if
params
[
:group
].
present?
@projects
=
@projects
.
includes
(
:namespace
,
:forked_from_project
,
:tags
)
@projects
=
@projects
.
tagged_with
(
params
[
:tag
])
if
params
[
:tag
].
present?
@projects
=
@projects
.
sort
(
@sort
=
params
[
:sort
])
@projects
=
@projects
.
page
(
params
[
:page
]).
per
(
30
)
@tags
=
current_user
.
authorized_projects
.
tags_on
(
:tags
)
@groups
=
current_user
.
authorized_groups
end
def
merge_requests
@merge_requests
=
get_merge_requests_collection
@merge_requests
=
@merge_requests
.
page
(
params
[
:page
]).
per
(
20
)
...
...
app/views/dashboard/projects.html.haml
deleted
100644 → 0
View file @
83f7e98d
%h3
.page-title
My Projects
=
link_to
new_project_path
,
class:
"btn btn-new pull-right"
do
%i
.fa.fa-plus
New Project
%p
.light
All projects you have access to are listed here. Public projects are not included here unless you are a member
%hr
.side-filters
=
render
"projects_filter"
.dash-projects
%ul
.bordered-list.my-projects.top-list
-
@projects
.
each
do
|
project
|
%li
.my-project-row
%h4
.project-title
.pull-left
=
project_icon
(
project
,
alt:
''
,
class:
'avatar project-avatar s60'
)
.project-access-icon
=
visibility_level_icon
(
project
.
visibility_level
)
=
link_to
project_path
(
project
),
class:
dom_class
(
project
)
do
%strong
=
project
.
name_with_namespace
-
if
project
.
forked_from_project
%small
%i
.fa.fa-code-fork
Forked from:
=
link_to
project
.
forked_from_project
.
name_with_namespace
,
namespace_project_path
(
project
.
namespace
,
project
.
forked_from_project
)
-
if
current_user
.
can_leave_project?
(
project
)
.pull-right
=
link_to
leave_namespace_project_team_members_path
(
project
.
namespace
,
project
),
data:
{
confirm:
"Leave project?"
},
method: :delete
,
remote:
true
,
class:
"btn-tiny btn remove-row"
,
title:
'Leave project'
do
%i
.fa.fa-sign-out
Leave
.project-info
.pull-right
-
if
project
.
archived?
%span
.label
%i
.fa.fa-archive
Archived
-
project
.
tags
.
each
do
|
tag
|
%span
.label.label-info
%i
.fa.fa-tag
=
tag
.
name
-
if
project
.
description
.
present?
%p
=
truncate
project
.
description
,
length:
100
.last-activity
%span
.light
Last activity:
%span
.date
=
project_last_activity
(
project
)
-
if
@projects
.
blank?
%li
.nothing-here-block
There are no projects here.
.bottom
=
paginate
@projects
,
theme:
"gitlab"
app/views/layouts/nav/_dashboard.html.haml
View file @
0414b2ae
...
...
@@ -2,11 +2,6 @@
=
nav_link
(
path:
'dashboard#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
root_path
,
title:
'Home'
,
class:
'shortcuts-activity'
do
%i
.fa.fa-dashboard
%span
Activity
=
nav_link
(
path:
'dashboard#projects'
)
do
=
link_to
projects_dashboard_path
,
title:
'Projects'
,
class:
'shortcuts-projects'
do
%i
.fa.fa-cube
%span
Projects
=
nav_link
(
path:
'projects#starred'
)
do
...
...
config/routes.rb
View file @
0414b2ae
...
...
@@ -208,7 +208,6 @@ Gitlab::Application.routes.draw do
#
resource
:dashboard
,
controller:
'dashboard'
,
only:
[
:show
]
do
member
do
get
:projects
get
:issues
get
:merge_requests
end
...
...
features/dashboard/projects.feature
deleted
100644 → 0
View file @
83f7e98d
@dashboard
Feature
:
Dashboard Projects
Background
:
Given
I sign in as a user
And
I own project
"Shop"
And
I visit dashboard projects page
Scenario
:
I
should see projects list
Then
I should see projects list
features/steps/dashboard/projects.rb
deleted
100644 → 0
View file @
83f7e98d
class
Spinach::Features::DashboardProjects
<
Spinach
::
FeatureSteps
include
SharedAuthentication
include
SharedPaths
include
SharedProject
step
'I should see projects list'
do
@user
.
authorized_projects
.
all
.
each
do
|
project
|
page
.
should
have_link
project
.
name_with_namespace
end
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