Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e89ffd54
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,发现更多精彩内容 >>
提交
e89ffd54
编写于
3月 09, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
上级
454810fe
5782a03f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
5 addition
and
11 deletion
+5
-11
CHANGELOG
CHANGELOG
+1
-0
app/services/git_push_service.rb
app/services/git_push_service.rb
+3
-1
app/views/projects/_bitbucket_import_modal.html.haml
app/views/projects/_bitbucket_import_modal.html.haml
+1
-1
spec/services/git_push_service_spec.rb
spec/services/git_push_service_spec.rb
+0
-9
未找到文件。
CHANGELOG
浏览文件 @
e89ffd54
Please view this file on the master branch, on stable branches it's out of date.
v 7.9.0 (unreleased)
- Fix mass SQL statements on initial push (Hannes Rosenögger)
- Add tag push notifications and normalize HipChat and Slack messages to be consistent (Stan Hu)
- Add comment notification events to HipChat and Slack services (Stan Hu)
- Add issue and merge request events to HipChat and Slack services (Stan Hu)
...
...
app/services/git_push_service.rb
浏览文件 @
e89ffd54
...
...
@@ -42,8 +42,10 @@ class GitPushService
# as a heuristic. This may include more commits than are actually pushed, but
# that shouldn't matter because we check for existing cross-references later.
@push_commits
=
project
.
repository
.
commits_between
(
project
.
default_branch
,
newrev
)
# don't process commits for the initial push to the default branch
process_commit_messages
(
ref
)
end
process_commit_messages
(
ref
)
elsif
push_to_existing_branch?
(
ref
,
oldrev
)
# Collect data for this git push
@push_commits
=
project
.
repository
.
commits_between
(
oldrev
,
newrev
)
...
...
app/views/projects/_bitbucket_import_modal.html.haml
浏览文件 @
e89ffd54
...
...
@@ -10,4 +10,4 @@
you need to
-
else
your GitLab administrator needs to
==
#{
link_to
'setup OAuth integration'
,
'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/butbucket.md'
}
.
\ No newline at end of file
==
#{
link_to
'setup OAuth integration'
,
'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/bitbucket.md'
}
.
spec/services/git_push_service_spec.rb
浏览文件 @
e89ffd54
...
...
@@ -197,15 +197,6 @@ describe GitPushService do
service
.
execute
(
project
,
user
,
@blankrev
,
@newrev
,
'refs/heads/other'
)
end
it
"finds references in the first push to a default branch"
do
allow
(
project
.
repository
).
to
receive
(
:commits_between
).
with
(
@blankrev
,
@newrev
).
and_return
([])
allow
(
project
.
repository
).
to
receive
(
:commits
).
with
(
@newrev
).
and_return
([
commit
])
expect
(
Note
).
to
receive
(
:create_cross_reference_note
).
with
(
issue
,
commit
,
commit_author
,
project
)
service
.
execute
(
project
,
user
,
@blankrev
,
@newrev
,
'refs/heads/master'
)
end
end
describe
"closing issues from pushed commits"
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录