Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
746e49fe
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 搜索 >>
提交
746e49fe
编写于
11月 03, 2015
作者:
A
Anton Baklanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Display target branch on MR list when it is different from project's default
上级
2ee3f838
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
36 addition
and
0 deletion
+36
-0
CHANGELOG
CHANGELOG
+1
-0
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+1
-0
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+5
-0
features/project/merge_requests.feature
features/project/merge_requests.feature
+9
-0
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+20
-0
未找到文件。
CHANGELOG
浏览文件 @
746e49fe
...
@@ -28,6 +28,7 @@ v 8.2.0 (unreleased)
...
@@ -28,6 +28,7 @@ v 8.2.0 (unreleased)
- Allow groups to appear in the search results if the group owner allows it
- Allow groups to appear in the search results if the group owner allows it
- New design for project graphs page
- New design for project graphs page
- Fix incoming email config defaults
- Fix incoming email config defaults
- MR target branch is now visible on a list view when it is different from project's default one
v 8.1.4
v 8.1.4
- Fix bug where manually merged branches in a MR would end up with an empty diff (Stan Hu)
- Fix bug where manually merged branches in a MR would end up with an empty diff (Stan Hu)
...
...
app/controllers/projects/merge_requests_controller.rb
浏览文件 @
746e49fe
...
@@ -31,6 +31,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -31,6 +31,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
end
@merge_requests
=
@merge_requests
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
@merge_requests
=
@merge_requests
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
@merge_requests
=
@merge_requests
.
preload
(
:target_project
)
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
...
...
app/views/projects/merge_requests/_merge_request.html.haml
浏览文件 @
746e49fe
...
@@ -41,6 +41,11 @@
...
@@ -41,6 +41,11 @@
%span
%span
%i
.fa.fa-clock-o
%i
.fa.fa-clock-o
=
merge_request
.
milestone
.
title
=
merge_request
.
milestone
.
title
-
if
merge_request
.
target_project
.
default_branch
!=
merge_request
.
target_branch
%span
%i
.fa.fa-code-fork
=
merge_request
.
target_branch
-
if
merge_request
.
tasks?
-
if
merge_request
.
tasks?
%span
.task-status
%span
.task-status
=
merge_request
.
task_status
=
merge_request
.
task_status
...
...
features/project/merge_requests.feature
浏览文件 @
746e49fe
...
@@ -16,6 +16,15 @@ Feature: Project Merge Requests
...
@@ -16,6 +16,15 @@ Feature: Project Merge Requests
When
I visit project
"Shop"
merge requests page
When
I visit project
"Shop"
merge requests page
Then
I should see merge request
"Bug NS-05"
with CI status
Then
I should see merge request
"Bug NS-05"
with CI status
Scenario
:
I
should not see target branch name when it is project's default branch
Then
I should see
"Bug NS-04"
in merge requests
And
I should not see
"master"
branch
Scenario
:
I
should see target branch when it is different from default
Given
project
"Shop"
have
"Bug NS-06"
open merge request
When
I visit project
"Shop"
merge requests page
Then
I should see
"other_branch"
branch
Scenario
:
I
should see rejected merge requests
Scenario
:
I
should see rejected merge requests
Given
I click link
"Closed"
Given
I click link
"Closed"
Then
I should see
"Feature NS-03"
in merge requests
Then
I should see
"Feature NS-03"
in merge requests
...
...
features/steps/project/merge_requests.rb
浏览文件 @
746e49fe
...
@@ -40,6 +40,14 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -40,6 +40,14 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
expect
(
page
).
to
have_content
"Bug NS-04"
expect
(
page
).
to
have_content
"Bug NS-04"
end
end
step
'I should not see "master" branch'
do
expect
(
page
).
not_to
have_content
"master"
end
step
'I should see "other_branch" branch'
do
expect
(
page
).
to
have_content
"other_branch"
end
step
'I should see "Bug NS-04" in merge requests'
do
step
'I should see "Bug NS-04" in merge requests'
do
expect
(
page
).
to
have_content
"Bug NS-04"
expect
(
page
).
to
have_content
"Bug NS-04"
end
end
...
@@ -93,6 +101,18 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -93,6 +101,18 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
)
)
end
end
step
'project "Shop" have "Bug NS-06" open merge request'
do
create
(
:merge_request
,
title:
"Bug NS-06"
,
source_project:
project
,
target_project:
project
,
source_branch:
'fix'
,
target_branch:
'other_branch'
,
author:
project
.
users
.
first
,
description:
"# Description header"
)
end
step
'project "Shop" have "Bug NS-05" open merge request with diffs inside'
do
step
'project "Shop" have "Bug NS-05" open merge request with diffs inside'
do
create
(
:merge_request_with_diffs
,
create
(
:merge_request_with_diffs
,
title:
"Bug NS-05"
,
title:
"Bug NS-05"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录