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
Jérome Perrin
gitlab-ce
Commits
f87f6480
Commit
f87f6480
authored
Sep 08, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use new routing helper
parent
1489d225
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
10 additions
and
10 deletions
+10
-10
app/controllers/invites_controller.rb
app/controllers/invites_controller.rb
+2
-2
app/controllers/projects/project_members_controller.rb
app/controllers/projects/project_members_controller.rb
+1
-1
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
app/views/dashboard/_activities.html.haml
app/views/dashboard/_activities.html.haml
+1
-1
features/steps/shared/paths.rb
features/steps/shared/paths.rb
+1
-1
spec/features/atom/dashboard_spec.rb
spec/features/atom/dashboard_spec.rb
+2
-2
spec/features/profiles/preferences_spec.rb
spec/features/profiles/preferences_spec.rb
+1
-1
spec/features/security/dashboard_access_spec.rb
spec/features/security/dashboard_access_spec.rb
+1
-1
No files found.
app/controllers/invites_controller.rb
View file @
f87f6480
...
@@ -24,7 +24,7 @@ class InvitesController < ApplicationController
...
@@ -24,7 +24,7 @@ class InvitesController < ApplicationController
path
=
path
=
if
current_user
if
current_user
dashboard_path
dashboard_p
rojects_p
ath
else
else
new_user_session_path
new_user_session_path
end
end
...
@@ -73,7 +73,7 @@ class InvitesController < ApplicationController
...
@@ -73,7 +73,7 @@ class InvitesController < ApplicationController
path
=
group_path
(
group
)
path
=
group_path
(
group
)
else
else
label
=
"who knows what"
label
=
"who knows what"
path
=
dashboard_path
path
=
dashboard_p
rojects_p
ath
end
end
[
label
,
path
]
[
label
,
path
]
...
...
app/controllers/projects/project_members_controller.rb
View file @
f87f6480
...
@@ -78,7 +78,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
...
@@ -78,7 +78,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
@project
.
project_members
.
find_by
(
user_id:
current_user
).
destroy
@project
.
project_members
.
find_by
(
user_id:
current_user
).
destroy
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
{
redirect_to
dashboard_path
}
format
.
html
{
redirect_to
dashboard_p
rojects_p
ath
}
format
.
js
{
render
nothing:
true
}
format
.
js
{
render
nothing:
true
}
end
end
end
end
...
...
app/controllers/projects_controller.rb
View file @
f87f6480
...
@@ -109,7 +109,7 @@ class ProjectsController < ApplicationController
...
@@ -109,7 +109,7 @@ class ProjectsController < ApplicationController
if
request
.
referer
.
include?
(
'/admin'
)
if
request
.
referer
.
include?
(
'/admin'
)
redirect_to
admin_namespaces_projects_path
redirect_to
admin_namespaces_projects_path
else
else
redirect_to
dashboard_path
redirect_to
dashboard_p
rojects_p
ath
end
end
rescue
Projects
::
DestroyService
::
DestroyError
=>
ex
rescue
Projects
::
DestroyService
::
DestroyError
=>
ex
redirect_to
edit_project_path
(
@project
),
alert:
ex
.
message
redirect_to
edit_project_path
(
@project
),
alert:
ex
.
message
...
...
app/views/dashboard/_activities.html.haml
View file @
f87f6480
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
-
if
current_user
-
if
current_user
%ul
.nav.nav-pills.event_filter.pull-right
%ul
.nav.nav-pills.event_filter.pull-right
%li
.pull-right
%li
.pull-right
=
link_to
dashboard_path
(
:atom
,
{
private_token:
current_user
.
private_token
}),
class:
'rss-btn'
do
=
link_to
dashboard_p
rojects_p
ath
(
:atom
,
{
private_token:
current_user
.
private_token
}),
class:
'rss-btn'
do
%i
.fa.fa-rss
%i
.fa.fa-rss
=
render
'shared/event_filter'
=
render
'shared/event_filter'
...
...
features/steps/shared/paths.rb
View file @
f87f6480
...
@@ -68,7 +68,7 @@ module SharedPaths
...
@@ -68,7 +68,7 @@ module SharedPaths
# ----------------------------------------
# ----------------------------------------
step
'I visit dashboard page'
do
step
'I visit dashboard page'
do
visit
dashboard_path
visit
dashboard_p
rojects_p
ath
end
end
step
'I visit dashboard activity page'
do
step
'I visit dashboard activity page'
do
...
...
spec/features/atom/dashboard_spec.rb
View file @
f87f6480
...
@@ -6,7 +6,7 @@ describe "Dashboard Feed", feature: true do
...
@@ -6,7 +6,7 @@ describe "Dashboard Feed", feature: true do
context
"projects atom feed via private token"
do
context
"projects atom feed via private token"
do
it
"should render projects atom feed"
do
it
"should render projects atom feed"
do
visit
dashboard_path
(
:atom
,
private_token:
user
.
private_token
)
visit
dashboard_p
rojects_p
ath
(
:atom
,
private_token:
user
.
private_token
)
expect
(
body
).
to
have_selector
(
'feed title'
)
expect
(
body
).
to
have_selector
(
'feed title'
)
end
end
end
end
...
@@ -20,7 +20,7 @@ describe "Dashboard Feed", feature: true do
...
@@ -20,7 +20,7 @@ describe "Dashboard Feed", feature: true do
project
.
team
<<
[
user
,
:master
]
project
.
team
<<
[
user
,
:master
]
issue_event
(
issue
,
user
)
issue_event
(
issue
,
user
)
note_event
(
note
,
user
)
note_event
(
note
,
user
)
visit
dashboard_path
(
:atom
,
private_token:
user
.
private_token
)
visit
dashboard_p
rojects_p
ath
(
:atom
,
private_token:
user
.
private_token
)
end
end
it
"should have issue opened event"
do
it
"should have issue opened event"
do
...
...
spec/features/profiles/preferences_spec.rb
View file @
f87f6480
...
@@ -70,7 +70,7 @@ describe 'Profile > Preferences', feature: true do
...
@@ -70,7 +70,7 @@ describe 'Profile > Preferences', feature: true do
expect
(
page
.
current_path
).
to
eq
starred_dashboard_projects_path
expect
(
page
.
current_path
).
to
eq
starred_dashboard_projects_path
click_link
'Your Projects'
click_link
'Your Projects'
expect
(
page
.
current_path
).
to
eq
dashboard_path
expect
(
page
.
current_path
).
to
eq
dashboard_p
rojects_p
ath
end
end
end
end
...
...
spec/features/security/dashboard_access_spec.rb
View file @
f87f6480
...
@@ -4,7 +4,7 @@ describe "Dashboard access", feature: true do
...
@@ -4,7 +4,7 @@ describe "Dashboard access", feature: true do
include
AccessMatchers
include
AccessMatchers
describe
"GET /dashboard"
do
describe
"GET /dashboard"
do
subject
{
dashboard_path
}
subject
{
dashboard_p
rojects_p
ath
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_allowed_for
:user
}
...
...
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