Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
48274581
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 搜索 >>
提交
48274581
编写于
3月 15, 2016
作者:
Z
Zeger-Jan van de Weg
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Incorporate the review and update spec
The feature spec now also tests the absence of the new branch button
上级
2b97c921
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
20 addition
and
21 deletion
+20
-21
CHANGELOG
CHANGELOG
+1
-1
app/models/issue.rb
app/models/issue.rb
+11
-11
app/services/system_note_service.rb
app/services/system_note_service.rb
+2
-2
spec/features/issues/new_branch_button_spec.rb
spec/features/issues/new_branch_button_spec.rb
+5
-6
spec/services/system_note_service_spec.rb
spec/services/system_note_service_spec.rb
+1
-1
未找到文件。
CHANGELOG
浏览文件 @
48274581
...
...
@@ -4,6 +4,7 @@ v 8.6.0 (unreleased)
- Bump gitlab_git to 9.0.3 (Stan Hu)
- Support Golang subpackage fetching (Stan Hu)
- Bump Capybara gem to 2.6.2 (Stan Hu)
- New branch button appears on issues where applicable
- Contributions to forked projects are included in calendar
- Improve the formatting for the user page bio (Connor Shea)
- Removed the default password from the initial admin account created during
...
...
@@ -59,7 +60,6 @@ v 8.5.3
- Show commit message in JIRA mention comment
- Makes issue page and merge request page usable on mobile browsers.
- Improved UI for profile settings
- New branch button appears on issues where applicable
v 8.5.2
- Fix sidebar overlapping content when screen width was below 1200px
...
...
app/models/issue.rb
浏览文件 @
48274581
...
...
@@ -87,20 +87,20 @@ class Issue < ActiveRecord::Base
end
def
referenced_merge_requests
(
current_user
=
nil
)
if
defined?
(
@referenced_merge_requests
)
@referenced_merge_requests
[
current_user
]
||=
Gitlab
::
ReferenceExtractor
.
lazily
do
[
self
,
*
notes
].
flat_map
do
|
note
|
note
.
all_references
(
current_user
).
merge_requests
end
end
.
sort_by
(
&
:iid
).
uniq
else
@referenced_merge_requests
=
{}
referenced_merge_requests
(
current_user
)
@referenced_merge_requests
||=
{}
@referenced_merge_requests
[
current_user
]
||=
begin
Gitlab
::
ReferenceExtractor
.
lazily
do
[
self
,
*
notes
].
flat_map
do
|
note
|
note
.
all_references
(
current_user
).
merge_requests
end
end
.
sort_by
(
&
:iid
).
uniq
end
end
def
related_branches
self
.
project
.
repository
.
branch_names
.
select
{
|
branch
|
branch
.
start_with?
"
#{
iid
}
-"
}
self
.
project
.
repository
.
branch_names
.
select
do
|
branch
|
branch
=~
/\A
#{
iid
}
-(?!\d+-stable)/i
end
end
# Reset issue events cache
...
...
@@ -138,6 +138,6 @@ class Issue < ActiveRecord::Base
!
self
.
closed?
&&
!
self
.
project
.
forked?
&&
self
.
related_branches
.
empty?
&&
self
.
referenced
_merge_requests
(
current_user
).
empty?
self
.
closed_by
_merge_requests
(
current_user
).
empty?
end
end
app/services/system_note_service.rb
浏览文件 @
48274581
...
...
@@ -213,9 +213,9 @@ class SystemNoteService
# "Started branch `201-issue-branch-button`"
def
self
.
new_issue_branch
(
issue
,
project
,
author
,
branch
)
h
=
Gitlab
::
Application
.
routes
.
url_helpers
link
=
"
#{
h
.
namespace_project_compare_url
(
project
.
namespace
,
project
,
from:
project
.
default_branch
,
to:
branch
)
}
"
link
=
h
.
namespace_project_compare_url
(
project
.
namespace
,
project
,
from:
project
.
default_branch
,
to:
branch
)
body
=
"Started branch [
#{
branch
}
](
#{
link
}
)"
body
=
"Started branch [
`
#{
branch
}
`
](
#{
link
}
)"
create_note
(
noteable:
issue
,
project:
project
,
author:
author
,
note:
body
)
end
...
...
spec/features/issues/new_branch_button_spec.rb
浏览文件 @
48274581
...
...
@@ -18,14 +18,13 @@ feature 'Start new branch from an issue', feature: true do
end
context
"when there is a referenced merge request"
do
let
(
:note
)
do
let
(
:note
)
do
create
(
:note
,
:on_issue
,
:system
,
project:
project
,
note:
"mentioned in !
#{
referenced_mr
.
iid
}
"
)
note:
"mentioned in !
#{
referenced_mr
.
iid
}
"
)
end
let
(
:referenced_mr
)
do
create
(
:merge_request
,
source_project:
project
,
target_project:
project
,
description:
"Fixes #
#{
issue
.
iid
}
"
)
let
(
:referenced_mr
)
do
create
(
:merge_request
,
:simple
,
source_project:
project
,
target_project:
project
,
description:
"Fixes #
#{
issue
.
iid
}
"
)
end
before
do
...
...
spec/services/system_note_service_spec.rb
浏览文件 @
48274581
...
...
@@ -287,7 +287,7 @@ describe SystemNoteService, services: true do
context
'when a branch is created from the new branch button'
do
it
'sets the note text'
do
expect
(
subject
.
note
).
to
eq
'Started branch 1-mepmep'
expect
(
subject
.
note
).
to
match
/\AStarted branch [`1-mepmep`]/
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录