Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
168d5eab
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 搜索 >>
提交
168d5eab
编写于
6月 15, 2015
作者:
M
Marin Jankovski
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
上级
6b96eb8e
646ce0aa
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
41 addition
and
18 deletion
+41
-18
CHANGELOG
CHANGELOG
+4
-0
app/assets/stylesheets/pages/dashboard.scss
app/assets/stylesheets/pages/dashboard.scss
+0
-4
app/services/git_push_service.rb
app/services/git_push_service.rb
+16
-10
app/services/issues/close_service.rb
app/services/issues/close_service.rb
+1
-1
app/views/shared/_project.html.haml
app/views/shared/_project.html.haml
+0
-2
doc/project_services/irker.md
doc/project_services/irker.md
+1
-1
spec/services/git_push_service_spec.rb
spec/services/git_push_service_spec.rb
+9
-0
spec/services/issues/close_service_spec.rb
spec/services/issues/close_service_spec.rb
+10
-0
未找到文件。
CHANGELOG
浏览文件 @
168d5eab
Please view this file on the master branch, on stable branches it's out of date.
Please view this file on the master branch, on stable branches it's out of date.
v 7.13.0 (unreleased)
- Remove project visibility icons from dashboard projects list
v 7.12.0 (unreleased)
v 7.12.0 (unreleased)
- Fix post-receive errors on a push when an external issue tracker is configured (Stan Hu)
- Update oauth button logos for Twitter and Google to recommended assets
- Update oauth button logos for Twitter and Google to recommended assets
- Update browser gem to version 0.8.0 for IE11 support (Stan Hu)
- Update browser gem to version 0.8.0 for IE11 support (Stan Hu)
- Fix timeout when rendering file with thousands of lines.
- Fix timeout when rendering file with thousands of lines.
...
...
app/assets/stylesheets/pages/dashboard.scss
浏览文件 @
168d5eab
...
@@ -28,10 +28,6 @@
...
@@ -28,10 +28,6 @@
font-size
:
14px
;
font-size
:
14px
;
line-height
:
24px
;
line-height
:
24px
;
.str-truncated
{
max-width
:
76%
;
}
a
{
a
{
display
:
block
;
display
:
block
;
padding
:
8px
15px
;
padding
:
8px
15px
;
...
...
app/services/git_push_service.rb
浏览文件 @
168d5eab
...
@@ -88,18 +88,24 @@ class GitPushService
...
@@ -88,18 +88,24 @@ class GitPushService
end
end
end
end
# Create cross-reference notes for any other references. Omit any issues that were referenced in an
if
project
.
default_issues_tracker?
# issue-closing phrase, or have already been mentioned from this commit (probably from this commit
create_cross_reference_notes
(
commit
,
issues_to_close
)
# being pushed to a different branch).
end
refs
=
commit
.
references
(
project
,
user
)
-
issues_to_close
end
refs
.
reject!
{
|
r
|
commit
.
has_mentioned?
(
r
)
}
end
if
refs
.
present?
def
create_cross_reference_notes
(
commit
,
issues_to_close
)
author
||=
commit_user
(
commit
)
# Create cross-reference notes for any other references. Omit any issues that were referenced in an
# issue-closing phrase, or have already been mentioned from this commit (probably from this commit
# being pushed to a different branch).
refs
=
commit
.
references
(
project
,
user
)
-
issues_to_close
refs
.
reject!
{
|
r
|
commit
.
has_mentioned?
(
r
)
}
refs
.
each
do
|
r
|
if
refs
.
present?
Note
.
create_cross_reference_note
(
r
,
commit
,
author
)
author
||=
commit_user
(
commit
)
end
refs
.
each
do
|
r
|
Note
.
create_cross_reference_note
(
r
,
commit
,
author
)
end
end
end
end
end
end
...
...
app/services/issues/close_service.rb
浏览文件 @
168d5eab
module
Issues
module
Issues
class
CloseService
<
Issues
::
BaseService
class
CloseService
<
Issues
::
BaseService
def
execute
(
issue
,
commit
=
nil
)
def
execute
(
issue
,
commit
=
nil
)
if
issue
.
close
if
project
.
default_issues_tracker?
&&
issue
.
close
event_service
.
close_issue
(
issue
,
current_user
)
event_service
.
close_issue
(
issue
,
current_user
)
create_note
(
issue
,
commit
)
create_note
(
issue
,
commit
)
notification_service
.
close_issue
(
issue
,
current_user
)
notification_service
.
close_issue
(
issue
,
current_user
)
...
...
app/views/shared/_project.html.haml
浏览文件 @
168d5eab
...
@@ -3,8 +3,6 @@
...
@@ -3,8 +3,6 @@
-
if
avatar
-
if
avatar
.dash-project-avatar
.dash-project-avatar
=
project_icon
(
project
,
alt:
''
,
class:
'avatar project-avatar s40'
)
=
project_icon
(
project
,
alt:
''
,
class:
'avatar project-avatar s40'
)
.dash-project-access-icon
=
visibility_level_icon
(
project
.
visibility_level
)
%span
.str-truncated
%span
.str-truncated
%span
.namespace-name
%span
.namespace-name
-
if
project
.
namespace
-
if
project
.
namespace
...
...
doc/project_services/irker.md
浏览文件 @
168d5eab
...
@@ -4,7 +4,7 @@ GitLab provides a way to push update messages to an Irker server. When
...
@@ -4,7 +4,7 @@ GitLab provides a way to push update messages to an Irker server. When
configured, pushes to a project will trigger the service to send data directly
configured, pushes to a project will trigger the service to send data directly
to the Irker server.
to the Irker server.
See the project homepage for further info: http
://www.catb.org/esr/irker/
See the project homepage for further info: http
s://gitlab.com/esr/irker
## Needed setup
## Needed setup
...
...
spec/services/git_push_service_spec.rb
浏览文件 @
168d5eab
...
@@ -233,6 +233,15 @@ describe GitPushService do
...
@@ -233,6 +233,15 @@ describe GitPushService do
expect
(
Issue
.
find
(
issue
.
id
)).
to
be_opened
expect
(
Issue
.
find
(
issue
.
id
)).
to
be_opened
end
end
it
"doesn't close issues when external issue tracker is in use"
do
allow
(
project
).
to
receive
(
:default_issues_tracker?
).
and_return
(
false
)
# The push still shouldn't create cross-reference notes.
expect
{
service
.
execute
(
project
,
user
,
@oldrev
,
@newrev
,
'refs/heads/hurf'
)
}.
not_to
change
{
Note
.
where
(
project_id:
project
.
id
,
system:
true
).
count
}
end
end
end
describe
"empty project"
do
describe
"empty project"
do
...
...
spec/services/issues/close_service_spec.rb
浏览文件 @
168d5eab
...
@@ -31,5 +31,15 @@ describe Issues::CloseService do
...
@@ -31,5 +31,15 @@ describe Issues::CloseService do
expect
(
note
.
note
).
to
include
"Status changed to closed"
expect
(
note
.
note
).
to
include
"Status changed to closed"
end
end
end
end
context
"external issue tracker"
do
before
do
allow
(
project
).
to
receive
(
:default_issues_tracker?
).
and_return
(
false
)
@issue
=
Issues
::
CloseService
.
new
(
project
,
user
,
{}).
execute
(
issue
)
end
it
{
expect
(
@issue
).
to
be_valid
}
it
{
expect
(
@issue
).
to
be_opened
}
end
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录