diff options
| author | James Lopez <james@jameslopez.es> | 2016-10-20 16:20:04 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-11-17 08:22:55 +0100 |
| commit | ebd5ced7eb296ce10160021d8999d21b36b24da9 (patch) | |
| tree | 710dc319adbcfdabb8297333d77f0626b33bcedc /app | |
| parent | 52e2729bf44ff3376071c2462679b46e9f67a44e (diff) | |
| download | gitlab-ce-ebd5ced7eb296ce10160021d8999d21b36b24da9.tar.gz | |
Added test events specs and logic. Also fixed some SQL and refactored the pipeline worker spec.
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index a3eb815dd34..d76feb9680e 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -232,7 +232,7 @@ class MergeRequest < ActiveRecord::Base end def diff_head_commit - if persisted?diff_head_commit + if persisted? merge_request_diff.head_commit else source_branch_head |