Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f7eb3573
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,发现更多精彩内容 >>
未验证
提交
f7eb3573
编写于
1月 18, 2017
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Ensure group acts as a namespace for polymorphic routes
Signed-off-by:
N
Rémy Coutable
<
remy@rymai.me
>
上级
5e9196b3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
3 deletion
+5
-3
app/views/projects/commit/_change.html.haml
app/views/projects/commit/_change.html.haml
+1
-1
spec/features/merge_requests/cherry_pick_spec.rb
spec/features/merge_requests/cherry_pick_spec.rb
+2
-1
spec/features/projects/commits/cherry_pick_spec.rb
spec/features/projects/commits/cherry_pick_spec.rb
+2
-1
未找到文件。
app/views/projects/commit/_change.html.haml
浏览文件 @
f7eb3573
...
...
@@ -13,7 +13,7 @@
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
.page-title
==
#{
label
}
this
#{
commit
.
change_type_title
(
current_user
)
}
.modal-body
=
form_tag
[
type
.
underscore
,
@project
.
namespace
,
@project
,
commit
],
method: :post
,
remote:
false
,
class:
"form-horizontal js-
#{
type
}
-form js-requires-input"
do
=
form_tag
[
type
.
underscore
,
@project
.
namespace
.
becomes
(
Namespace
)
,
@project
,
commit
],
method: :post
,
remote:
false
,
class:
"form-horizontal js-
#{
type
}
-form js-requires-input"
do
.form-group.branch
=
label_tag
'target_branch'
,
target_label
,
class:
'control-label'
.col-sm-10
...
...
spec/features/merge_requests/cherry_pick_spec.rb
浏览文件 @
f7eb3573
...
...
@@ -2,7 +2,8 @@ require 'spec_helper'
describe
'Cherry-pick Merge Requests'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:project
)
{
create
(
:project
,
namespace:
group
)
}
let
(
:merge_request
)
{
create
(
:merge_request_with_diffs
,
source_project:
project
,
author:
user
)
}
before
do
...
...
spec/features/projects/commits/cherry_pick_spec.rb
浏览文件 @
f7eb3573
...
...
@@ -2,7 +2,8 @@ require 'spec_helper'
include
WaitForAjax
describe
'Cherry-pick Commits'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:project
)
{
create
(
:project
,
namespace:
group
)
}
let
(
:master_pickable_commit
)
{
project
.
commit
(
'7d3b0f7cff5f37573aea97cebfd5692ea1689924'
)
}
let
(
:master_pickable_merge
)
{
project
.
commit
(
'e56497bb5f03a90a51293fc6d516788730953899'
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录