diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-22 14:37:14 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-10-05 11:48:25 +0300 |
| commit | 324f672eefcd3db1337d51f5137dd085c4697c8c (patch) | |
| tree | 09d82e448b673d36584be29176d47f370d07804b /app/models/merge_request_diff.rb | |
| parent | 149adcd1206ba3bebd20401bf45ef7e67ec690fb (diff) | |
Keep only the changes that are known to work well
Also, improved a bit the method names in
Github::Representation::PullRequest.
Last but not least, ensure temp branch names doesn't contain a `/` as
this would create the ref in a subfolder in `refs/heads` (e.g.
`refs/heads/gh-123/456/rymai/foo`), and would leave empty directories
upon branch deletion (e.g. `refs/heads/gh-123/456/rymai/`.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/models/merge_request_diff.rb')
| -rw-r--r-- | app/models/merge_request_diff.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index cd20df8404a..68c87210772 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -55,7 +55,7 @@ class MergeRequestDiff < ActiveRecord::Base end def ensure_commit_shas - merge_request.fetch_ref unless merge_request.source_branch_head + merge_request.fetch_ref self.start_commit_sha ||= merge_request.target_branch_sha self.head_commit_sha ||= merge_request.source_branch_sha |