Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
034e8593
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,发现更多精彩内容 >>
提交
034e8593
编写于
11月 08, 2016
作者:
S
Sean McGivern
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dz-fix-project-index' into 'master'
Fix project index page See merge request !7331
上级
67ca15bb
8357ae98
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
24 addition
and
3 deletion
+24
-3
CHANGELOG.md
CHANGELOG.md
+1
-0
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+3
-3
spec/controllers/projects_controller_spec.rb
spec/controllers/projects_controller_spec.rb
+20
-0
未找到文件。
CHANGELOG.md
浏览文件 @
034e8593
...
...
@@ -71,6 +71,7 @@ entry.
-
Fix applying GitHub-imported labels when importing job is interrupted
-
Allow to search for user by secondary email address in the admin interface(/admin/users) !7115 (YarNayar)
-
Updated commit SHA styling on the branches page.
-
Fix 404 when visit /projects page
## 8.13.3 (2016-11-02)
...
...
app/controllers/projects_controller.rb
浏览文件 @
034e8593
...
...
@@ -2,9 +2,9 @@ class ProjectsController < Projects::ApplicationController
include
IssuableCollections
include
ExtractsPath
before_action
:authenticate_user!
,
except:
[
:show
,
:activity
,
:refs
]
before_action
:project
,
except:
[
:new
,
:create
]
before_action
:repository
,
except:
[
:new
,
:create
]
before_action
:authenticate_user!
,
except:
[
:
index
,
:
show
,
:activity
,
:refs
]
before_action
:project
,
except:
[
:
index
,
:
new
,
:create
]
before_action
:repository
,
except:
[
:
index
,
:
new
,
:create
]
before_action
:assign_ref_vars
,
only:
[
:show
],
if: :repo_exists?
before_action
:tree
,
only:
[
:show
],
if:
[
:repo_exists?
,
:project_view_files?
]
...
...
spec/controllers/projects_controller_spec.rb
浏览文件 @
034e8593
...
...
@@ -7,6 +7,26 @@ describe ProjectsController do
let
(
:jpg
)
{
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/rails_sample.jpg'
,
'image/jpg'
)
}
let
(
:txt
)
{
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/doc_sample.txt'
,
'text/plain'
)
}
describe
'GET index'
do
context
'as a user'
do
it
'redirects to root page'
do
sign_in
(
user
)
get
:index
expect
(
response
).
to
redirect_to
(
root_path
)
end
end
context
'as a guest'
do
it
'redirects to Explore page'
do
get
:index
expect
(
response
).
to
redirect_to
(
explore_root_path
)
end
end
end
describe
"GET show"
do
context
"user not project member"
do
before
{
sign_in
(
user
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录