Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
e89ffd54
Commit
e89ffd54
authored
Mar 09, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
454810fe
5782a03f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
11 deletions
+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
No files found.
CHANGELOG
View file @
e89ffd54
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.9.0 (unreleased)
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 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 comment notification events to HipChat and Slack services (Stan Hu)
- Add issue and merge request 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
View file @
e89ffd54
...
@@ -42,8 +42,10 @@ class GitPushService
...
@@ -42,8 +42,10 @@ class GitPushService
# as a heuristic. This may include more commits than are actually pushed, but
# 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.
# that shouldn't matter because we check for existing cross-references later.
@push_commits
=
project
.
repository
.
commits_between
(
project
.
default_branch
,
newrev
)
@push_commits
=
project
.
repository
.
commits_between
(
project
.
default_branch
,
newrev
)
end
# don't process commits for the initial push to the default branch
process_commit_messages
(
ref
)
process_commit_messages
(
ref
)
end
elsif
push_to_existing_branch?
(
ref
,
oldrev
)
elsif
push_to_existing_branch?
(
ref
,
oldrev
)
# Collect data for this git push
# Collect data for this git push
@push_commits
=
project
.
repository
.
commits_between
(
oldrev
,
newrev
)
@push_commits
=
project
.
repository
.
commits_between
(
oldrev
,
newrev
)
...
...
app/views/projects/_bitbucket_import_modal.html.haml
View file @
e89ffd54
...
@@ -10,4 +10,4 @@
...
@@ -10,4 +10,4 @@
you need to
you need to
-
else
-
else
your GitLab administrator needs to
your GitLab administrator needs to
==
#{
link_to
'setup OAuth integration'
,
'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/butbucket.md'
}
.
==
#{
link_to
'setup OAuth integration'
,
'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/bitbucket.md'
}
.
\ No newline at end of file
spec/services/git_push_service_spec.rb
View file @
e89ffd54
...
@@ -197,15 +197,6 @@ describe GitPushService do
...
@@ -197,15 +197,6 @@ describe GitPushService do
service
.
execute
(
project
,
user
,
@blankrev
,
@newrev
,
'refs/heads/other'
)
service
.
execute
(
project
,
user
,
@blankrev
,
@newrev
,
'refs/heads/other'
)
end
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
end
describe
"closing issues from pushed commits"
do
describe
"closing issues from pushed commits"
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment