Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
bb48a0fa
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 搜索 >>
提交
bb48a0fa
编写于
8月 18, 2016
作者:
W
winniehell
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Do not escape URI when extracting path (!5878)
上级
f3ee7fc8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
20 deletion
+4
-20
CHANGELOG
CHANGELOG
+1
-0
lib/extracts_path.rb
lib/extracts_path.rb
+3
-9
spec/lib/extracts_path_spec.rb
spec/lib/extracts_path_spec.rb
+0
-11
未找到文件。
CHANGELOG
浏览文件 @
bb48a0fa
...
@@ -29,6 +29,7 @@ v 8.11.0 (unreleased)
...
@@ -29,6 +29,7 @@ v 8.11.0 (unreleased)
- Fix CI status icon link underline (ClemMakesApps)
- Fix CI status icon link underline (ClemMakesApps)
- The Repository class is now instrumented
- The Repository class is now instrumented
- Fix commit mention font inconsistency (ClemMakesApps)
- Fix commit mention font inconsistency (ClemMakesApps)
- Do not escape URI when extracting path !5878 (winniehell)
- Fix filter label tooltip HTML rendering (ClemMakesApps)
- Fix filter label tooltip HTML rendering (ClemMakesApps)
- Cache the commit author in RequestStore to avoid extra lookups in PostReceive
- Cache the commit author in RequestStore to avoid extra lookups in PostReceive
- Expand commit message width in repo view (ClemMakesApps)
- Expand commit message width in repo view (ClemMakesApps)
...
...
lib/extracts_path.rb
浏览文件 @
bb48a0fa
...
@@ -94,7 +94,9 @@ module ExtractsPath
...
@@ -94,7 +94,9 @@ module ExtractsPath
@options
=
params
.
select
{
|
key
,
value
|
allowed_options
.
include?
(
key
)
&&
!
value
.
blank?
}
@options
=
params
.
select
{
|
key
,
value
|
allowed_options
.
include?
(
key
)
&&
!
value
.
blank?
}
@options
=
HashWithIndifferentAccess
.
new
(
@options
)
@options
=
HashWithIndifferentAccess
.
new
(
@options
)
@id
=
Addressable
::
URI
.
normalize_component
(
get_id
)
@id
=
params
[
:id
]
||
params
[
:ref
]
@id
+=
"/"
+
params
[
:path
]
unless
params
[
:path
].
blank?
@ref
,
@path
=
extract_ref
(
@id
)
@ref
,
@path
=
extract_ref
(
@id
)
@repo
=
@project
.
repository
@repo
=
@project
.
repository
if
@options
[
:extended_sha1
].
blank?
if
@options
[
:extended_sha1
].
blank?
...
@@ -116,12 +118,4 @@ module ExtractsPath
...
@@ -116,12 +118,4 @@ module ExtractsPath
def
tree
def
tree
@tree
||=
@repo
.
tree
(
@commit
.
id
,
@path
)
@tree
||=
@repo
.
tree
(
@commit
.
id
,
@path
)
end
end
private
def
get_id
id
=
params
[
:id
]
||
params
[
:ref
]
id
+=
"/"
+
params
[
:path
]
unless
params
[
:path
].
blank?
id
end
end
end
spec/lib/extracts_path_spec.rb
浏览文件 @
bb48a0fa
...
@@ -30,17 +30,6 @@ describe ExtractsPath, lib: true do
...
@@ -30,17 +30,6 @@ describe ExtractsPath, lib: true do
expect
(
@logs_path
).
to
eq
(
"/
#{
@project
.
path_with_namespace
}
/refs/
#{
ref
}
/logs_tree/files/ruby/popen.rb"
)
expect
(
@logs_path
).
to
eq
(
"/
#{
@project
.
path_with_namespace
}
/refs/
#{
ref
}
/logs_tree/files/ruby/popen.rb"
)
end
end
context
'escaped slash character in ref'
do
let
(
:ref
)
{
'improve%2Fawesome'
}
it
'has no escape sequences in @ref or @logs_path'
do
assign_ref_vars
expect
(
@ref
).
to
eq
(
'improve/awesome'
)
expect
(
@logs_path
).
to
eq
(
"/
#{
@project
.
path_with_namespace
}
/refs/
#{
ref
}
/logs_tree/files/ruby/popen.rb"
)
end
end
context
'ref contains %20'
do
context
'ref contains %20'
do
let
(
:ref
)
{
'foo%20bar'
}
let
(
:ref
)
{
'foo%20bar'
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录