Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f87f6480
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f87f6480
编写于
9月 08, 2015
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use new routing helper
上级
1489d225
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
10 addition
and
10 deletion
+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
未找到文件。
app/controllers/invites_controller.rb
浏览文件 @
f87f6480
...
...
@@ -24,7 +24,7 @@ class InvitesController < ApplicationController
path
=
if
current_user
dashboard_path
dashboard_p
rojects_p
ath
else
new_user_session_path
end
...
...
@@ -73,7 +73,7 @@ class InvitesController < ApplicationController
path
=
group_path
(
group
)
else
label
=
"who knows what"
path
=
dashboard_path
path
=
dashboard_p
rojects_p
ath
end
[
label
,
path
]
...
...
app/controllers/projects/project_members_controller.rb
浏览文件 @
f87f6480
...
...
@@ -78,7 +78,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
@project
.
project_members
.
find_by
(
user_id:
current_user
).
destroy
respond_to
do
|
format
|
format
.
html
{
redirect_to
dashboard_path
}
format
.
html
{
redirect_to
dashboard_p
rojects_p
ath
}
format
.
js
{
render
nothing:
true
}
end
end
...
...
app/controllers/projects_controller.rb
浏览文件 @
f87f6480
...
...
@@ -109,7 +109,7 @@ class ProjectsController < ApplicationController
if
request
.
referer
.
include?
(
'/admin'
)
redirect_to
admin_namespaces_projects_path
else
redirect_to
dashboard_path
redirect_to
dashboard_p
rojects_p
ath
end
rescue
Projects
::
DestroyService
::
DestroyError
=>
ex
redirect_to
edit_project_path
(
@project
),
alert:
ex
.
message
...
...
app/views/dashboard/_activities.html.haml
浏览文件 @
f87f6480
...
...
@@ -5,7 +5,7 @@
-
if
current_user
%ul
.nav.nav-pills.event_filter.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
=
render
'shared/event_filter'
...
...
features/steps/shared/paths.rb
浏览文件 @
f87f6480
...
...
@@ -68,7 +68,7 @@ module SharedPaths
# ----------------------------------------
step
'I visit dashboard page'
do
visit
dashboard_path
visit
dashboard_p
rojects_p
ath
end
step
'I visit dashboard activity page'
do
...
...
spec/features/atom/dashboard_spec.rb
浏览文件 @
f87f6480
...
...
@@ -6,7 +6,7 @@ describe "Dashboard Feed", feature: true do
context
"projects atom feed via private token"
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'
)
end
end
...
...
@@ -20,7 +20,7 @@ describe "Dashboard Feed", feature: true do
project
.
team
<<
[
user
,
:master
]
issue_event
(
issue
,
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
it
"should have issue opened event"
do
...
...
spec/features/profiles/preferences_spec.rb
浏览文件 @
f87f6480
...
...
@@ -70,7 +70,7 @@ describe 'Profile > Preferences', feature: true do
expect
(
page
.
current_path
).
to
eq
starred_dashboard_projects_path
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
...
...
spec/features/security/dashboard_access_spec.rb
浏览文件 @
f87f6480
...
...
@@ -4,7 +4,7 @@ describe "Dashboard access", feature: true do
include
AccessMatchers
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
:user
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录