Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8530ce4c
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,发现更多精彩内容 >>
提交
8530ce4c
编写于
4月 18, 2016
作者:
R
Robert Speicher
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clarify that the diff view setting always comes from the cookie
This invalidates one test, which we've removed.
上级
90a67a76
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
1 addition
and
10 deletion
+1
-10
app/controllers/projects/application_controller.rb
app/controllers/projects/application_controller.rb
+1
-2
spec/controllers/projects/merge_requests_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb
+0
-8
未找到文件。
app/controllers/projects/application_controller.rb
浏览文件 @
8530ce4c
...
@@ -83,8 +83,7 @@ class Projects::ApplicationController < ApplicationController
...
@@ -83,8 +83,7 @@ class Projects::ApplicationController < ApplicationController
end
end
def
apply_diff_view_cookie!
def
apply_diff_view_cookie!
view
=
params
[
:view
]
||
cookies
[
:diff_view
]
cookies
.
permanent
[
:diff_view
]
=
params
.
delete
(
:view
)
if
params
[
:view
].
present?
cookies
.
permanent
[
:diff_view
]
=
params
[
:view
]
=
view
if
view
end
end
def
builds_enabled
def
builds_enabled
...
...
spec/controllers/projects/merge_requests_controller_spec.rb
浏览文件 @
8530ce4c
...
@@ -300,14 +300,6 @@ describe Projects::MergeRequestsController do
...
@@ -300,14 +300,6 @@ describe Projects::MergeRequestsController do
expect
(
response
.
cookies
[
'diff_view'
]).
to
eq
(
'parallel'
)
expect
(
response
.
cookies
[
'diff_view'
]).
to
eq
(
'parallel'
)
end
end
it
'assigns :view param based on cookie'
do
request
.
cookies
[
'diff_view'
]
=
'parallel'
go
expect
(
controller
.
params
[
:view
]).
to
eq
'parallel'
end
end
end
describe
'GET commits'
do
describe
'GET commits'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录