Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
59154779
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,发现更多精彩内容 >>
提交
59154779
编写于
6月 20, 2018
作者:
H
Hiroyuki Sato
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
The json keys of ref switcher should not be translated
上级
7a633e08
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
24 addition
and
2 deletion
+24
-2
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+2
-2
changelogs/unreleased/48100-fix-branch-not-shown.yml
changelogs/unreleased/48100-fix-branch-not-shown.yml
+6
-0
spec/controllers/projects_controller_spec.rb
spec/controllers/projects_controller_spec.rb
+16
-0
未找到文件。
app/controllers/projects_controller.rb
浏览文件 @
59154779
...
...
@@ -247,13 +247,13 @@ class ProjectsController < Projects::ApplicationController
if
find_branches
branches
=
BranchesFinder
.
new
(
@repository
,
params
).
execute
.
take
(
100
).
map
(
&
:name
)
options
[
s_
(
'RefSwitcher|Branches'
)
]
=
branches
options
[
'Branches'
]
=
branches
end
if
find_tags
&&
@repository
.
tag_count
.
nonzero?
tags
=
TagsFinder
.
new
(
@repository
,
params
).
execute
.
take
(
100
).
map
(
&
:name
)
options
[
s_
(
'RefSwitcher|Tags'
)
]
=
tags
options
[
'Tags'
]
=
tags
end
# If reference is commit id - we should add it to branch/tag selectbox
...
...
changelogs/unreleased/48100-fix-branch-not-shown.yml
0 → 100644
浏览文件 @
59154779
---
title
:
Fix branches are not shown in Merge Request dropdown when preferred language
is not English
merge_request
:
20016
author
:
Hiroyuki Sato
type
:
fixed
spec/controllers/projects_controller_spec.rb
浏览文件 @
59154779
...
...
@@ -597,6 +597,22 @@ describe ProjectsController do
expect
(
parsed_body
[
"Tags"
]).
to
include
(
"v1.0.0"
)
expect
(
parsed_body
[
"Commits"
]).
to
include
(
"123456"
)
end
context
"when preferred language is Japanese"
do
before
do
user
.
update!
(
preferred_language:
'ja'
)
sign_in
(
user
)
end
it
"gets a list of branches, tags and commits"
do
get
:refs
,
namespace_id:
public_project
.
namespace
,
id:
public_project
,
ref:
"123456"
parsed_body
=
JSON
.
parse
(
response
.
body
)
expect
(
parsed_body
[
"Branches"
]).
to
include
(
"master"
)
expect
(
parsed_body
[
"Tags"
]).
to
include
(
"v1.0.0"
)
expect
(
parsed_body
[
"Commits"
]).
to
include
(
"123456"
)
end
end
end
describe
'POST #preview_markdown'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录