Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
017ed4ae
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 搜索 >>
提交
017ed4ae
编写于
4月 06, 2016
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed builds
上级
8cdb5058
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
30 addition
and
23 deletion
+30
-23
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+4
-0
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+1
-8
app/views/projects/merge_requests/_new_compare.html.haml
app/views/projects/merge_requests/_new_compare.html.haml
+4
-4
features/project/forked_merge_requests.feature
features/project/forked_merge_requests.feature
+1
-0
features/project/merge_requests.feature
features/project/merge_requests.feature
+1
-0
features/steps/project/forked_merge_requests.rb
features/steps/project/forked_merge_requests.rb
+13
-9
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+6
-2
未找到文件。
app/assets/stylesheets/pages/merge_requests.scss
浏览文件 @
017ed4ae
...
...
@@ -235,6 +235,10 @@
padding
:
0
;
background
:
transparent
;
}
.ci-status-link
{
margin-right
:
5px
;
}
}
.merge-request-select
{
...
...
app/views/projects/commits/_commit.html.haml
浏览文件 @
017ed4ae
...
...
@@ -19,23 +19,16 @@
.pull-right
-
if
ci_commit
=
render_ci_status
(
ci_commit
)
=
clipboard_button
(
clipboard_text:
commit
.
id
)
=
link_to
commit
.
short_id
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
),
class:
"commit_short_id"
.notes_count
-
if
note_count
>
0
%span
.light
%i
.fa.fa-comments
=
note_count
-
if
commit
.
description?
.commit-row-description.js-toggle-content
%pre
=
preserve
(
markdown
(
escape_once
(
commit
.
description
),
pipeline: :single_line
))
.commit-row-info
by
by
=
commit_author_link
(
commit
,
avatar:
true
,
size:
24
)
.committed_ago
#{
time_ago_with_tooltip
(
commit
.
committed_date
,
skip_js:
true
)
}
...
...
app/views/projects/merge_requests/_new_compare.html.haml
浏览文件 @
017ed4ae
...
...
@@ -12,7 +12,7 @@
.merge-request-select.dropdown
=
f
.
hidden_field
:source_project_id
=
dropdown_toggle
@merge_request
.
source_project_path
,
{
toggle:
"dropdown"
,
field_name:
"
#{
f
.
object_name
}
[source_project_id]"
,
disabled:
@merge_request
.
persisted?
},
{
toggle_class:
"js-compare-dropdown js-source-project"
}
.dropdown-menu.dropdown-menu-selectable
.dropdown-menu.dropdown-menu-selectable
.dropdown-source-project
=
dropdown_title
(
"Select source project"
)
=
dropdown_filter
(
"Search projects"
)
=
dropdown_content
do
...
...
@@ -23,7 +23,7 @@
.merge-request-select.dropdown
=
f
.
hidden_field
:source_branch
=
dropdown_toggle
"Select source branch"
,
{
toggle:
"dropdown"
,
field_name:
"
#{
f
.
object_name
}
[source_branch]"
},
{
toggle_class:
"js-compare-dropdown js-source-branch"
}
.dropdown-menu.dropdown-menu-selectable
.dropdown-menu.dropdown-menu-selectable
.dropdown-source-branch
=
dropdown_title
(
"Select source branch"
)
=
dropdown_filter
(
"Search branches"
)
=
dropdown_content
do
...
...
@@ -45,7 +45,7 @@
.merge-request-select.dropdown
=
f
.
hidden_field
:target_project_id
=
dropdown_toggle
f
.
object
.
target_project
.
path_with_namespace
,
{
toggle:
"dropdown"
,
field_name:
"
#{
f
.
object_name
}
[target_project_id]"
,
disabled:
@merge_request
.
persisted?
},
{
toggle_class:
"js-compare-dropdown js-target-project"
}
.dropdown-menu.dropdown-menu-selectable
.dropdown-menu.dropdown-menu-selectable
.dropdown-target-project
=
dropdown_title
(
"Select target project"
)
=
dropdown_filter
(
"Search projects"
)
=
dropdown_content
do
...
...
@@ -57,7 +57,7 @@
.merge-request-select.dropdown
=
f
.
hidden_field
:target_branch
=
dropdown_toggle
f
.
object
.
target_branch
,
{
toggle:
"dropdown"
,
field_name:
"
#{
f
.
object_name
}
[target_branch]"
},
{
toggle_class:
"js-compare-dropdown js-target-branch"
}
.dropdown-menu.dropdown-menu-selectable.js-target-branch-dropdown
.dropdown-menu.dropdown-menu-selectable.
dropdown-target-branch.
js-target-branch-dropdown
=
dropdown_title
(
"Select target branch"
)
=
dropdown_filter
(
"Search branches"
)
=
dropdown_content
do
...
...
features/project/forked_merge_requests.feature
浏览文件 @
017ed4ae
...
...
@@ -4,6 +4,7 @@ Feature: Project Forked Merge Requests
And
I am a member of project
"Shop"
And
I have a project forked off of
"Shop"
called
"Forked Shop"
@javascript
Scenario
:
I
submit new unassigned merge request to a forked project
Given
I visit project
"Forked Shop"
merge requests page
And
I click link
"New Merge Request"
...
...
features/project/merge_requests.feature
浏览文件 @
017ed4ae
...
...
@@ -70,6 +70,7 @@ Feature: Project Merge Requests
When
I click link
"Reopen"
Then
I should see reopened merge request
"Bug NS-04"
@javascript
Scenario
:
I
submit new unassigned merge request
Given
I click link
"New Merge Request"
And
I submit new merge request
"Wiki Feature"
...
...
features/steps/project/forked_merge_requests.rb
浏览文件 @
017ed4ae
...
...
@@ -34,10 +34,14 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
end
step
'I fill out a "Merge Request On Forked Project" merge request'
do
select
@forked_project
.
path_with_namespace
,
from:
"merge_request_source_project_id"
select
@project
.
path_with_namespace
,
from:
"merge_request_target_project_id"
select
"fix"
,
from:
"merge_request_source_branch"
select
"master"
,
from:
"merge_request_target_branch"
first
(
'.js-source-project'
).
click
first
(
'.dropdown-source-project a'
,
text:
@forked_project
.
path_with_namespace
)
first
(
'.js-target-project'
).
click
first
(
'.dropdown-target-project a'
,
text:
@project
.
path_with_namespace
)
first
(
'.js-source-branch'
).
click
first
(
'.dropdown-source-branch .dropdown-content a'
,
text:
'fix'
).
click
click_button
"Compare branches and continue"
...
...
@@ -115,10 +119,10 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
end
step
'I fill out an invalid "Merge Request On Forked Project" merge request'
do
expect
(
find
(
:select
,
"merge_request_source_project_id"
,
{}
).
value
).
to
eq
@forked_project
.
id
.
to_s
expect
(
find
(
:select
,
"merge_request_target_project_id"
,
{}
).
value
).
to
eq
@project
.
id
.
to_s
expect
(
find
(
:select
,
"merge_request_source_branch"
,
{}).
value
).
to
eq
""
expect
(
find
(
:select
,
"merge_request_target_branch"
,
{}
).
value
).
to
eq
"master"
expect
(
find
_by_id
(
"merge_request_source_project_id"
,
visible:
false
).
value
).
to
eq
@forked_project
.
id
.
to_s
expect
(
find
_by_id
(
"merge_request_target_project_id"
,
visible:
false
).
value
).
to
eq
@project
.
id
.
to_s
expect
(
find
_by_id
(
"merge_request_source_branch"
,
visible:
false
).
value
).
to
eq
nil
expect
(
find
_by_id
(
"merge_request_target_branch"
,
visible:
false
).
value
).
to
eq
"master"
click_button
"Compare branches"
end
...
...
@@ -127,7 +131,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
end
step
'the target repository should be the original repository'
do
expect
(
page
).
to
have_select
(
"merge_request_target_project_id"
,
selected:
@project
.
path_with_namespace
)
expect
(
find_by_id
(
"merge_request_target_project_id"
).
value
).
to
eq
"
#{
@project
.
id
}
"
end
step
'I click "Assign to" dropdown"'
do
...
...
features/steps/project/merge_requests.rb
浏览文件 @
017ed4ae
...
...
@@ -93,8 +93,12 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
step
'I submit new merge request "Wiki Feature"'
do
select
"fix"
,
from:
"merge_request_source_branch"
select
"feature"
,
from:
"merge_request_target_branch"
find
(
'.js-source-branch'
).
click
find
(
'.dropdown-source-branch .dropdown-content a'
,
text:
'fix'
).
click
find
(
'.js-target-branch'
).
click
first
(
'.dropdown-target-branch .dropdown-content a'
,
text:
'feature'
).
click
click_button
"Compare branches"
fill_in
"merge_request_title"
,
with:
"Wiki Feature"
click_button
"Submit merge request"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录