Commit 42e97d28 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'fix_tests' into 'master'

Fix failing tests

Revert the last merge, as it breaks the master and I didn't see that this line is used in hooks as well when I merged this.

See merge request !390
parents 07f9a3f9 2172d7ff
...@@ -2,7 +2,6 @@ Please view this file on the master branch, on stable branches it's out of date. ...@@ -2,7 +2,6 @@ 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)
- Update documentation for object_kind field in Webhook push and tag push Webhooks (Stan Hu) - Update documentation for object_kind field in Webhook push and tag push Webhooks (Stan Hu)
- Remove unnecessary fetch of commit messages on initial push (Perforce Software)
- Fix broken email images (Hannes Rosenögger) - Fix broken email images (Hannes Rosenögger)
- Fix mass SQL statements on initial push (Hannes Rosenögger) - 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)
......
...@@ -29,6 +29,9 @@ class GitPushService ...@@ -29,6 +29,9 @@ class GitPushService
elsif push_to_new_branch?(ref, oldrev) elsif push_to_new_branch?(ref, oldrev)
# Re-find the pushed commits. # Re-find the pushed commits.
if is_default_branch?(ref) if is_default_branch?(ref)
# Initial push to the default branch. Take the full history of that branch as "newly pushed".
@push_commits = project.repository.commits(newrev)
# Set protection on the default branch if configured # Set protection on the default branch if configured
if (current_application_settings.default_branch_protection != PROTECTION_NONE) if (current_application_settings.default_branch_protection != PROTECTION_NONE)
developers_can_push = current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_PUSH ? true : false developers_can_push = current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_PUSH ? true : false
......
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