Commit e89ffd54 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'master' of

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)
......@@ -42,8 +42,10 @@ def execute(project, user, oldrev, newrev, ref)
# 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
elsif push_to_existing_branch?(ref, oldrev)
# Collect data for this git push
@push_commits = project.repository.commits_between(oldrev, newrev)
......@@ -10,4 +10,4 @@
you need to
- else
your GitLab administrator needs to
== #{link_to 'setup OAuth integration', ''}.
\ No newline at end of file
== #{link_to 'setup OAuth integration', ''}.
......@@ -197,15 +197,6 @@
service.execute(project, user, @blankrev, @newrev, 'refs/heads/other')
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')
describe "closing issues from pushed commits" do
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment