diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-02 18:37:40 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-02 18:37:40 +0300 |
| commit | e4c20cd3fe330faa415493ee2fe30dc16fbaca80 (patch) | |
| tree | 0be61b6cc59cf35d81b9271c7603e0d8b203a31c /app/models/merge_request_diff_file.rb | |
| parent | 25d6a6c4b528159c288995de4909e6a8da431d0b (diff) | |
| parent | 88958e5a9cd364ae36f3d2837982cedb9239c3bc (diff) | |
Merge branch 'master' into sidebar-fly-out-sub-nav
Diffstat (limited to 'app/models/merge_request_diff_file.rb')
| -rw-r--r-- | app/models/merge_request_diff_file.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/models/merge_request_diff_file.rb b/app/models/merge_request_diff_file.rb index 598ebd4d829..1199ff5af22 100644 --- a/app/models/merge_request_diff_file.rb +++ b/app/models/merge_request_diff_file.rb @@ -8,4 +8,14 @@ class MergeRequestDiffFile < ActiveRecord::Base encode_utf8(diff) if diff.respond_to?(:encoding) end + + def diff + binary? ? super.unpack('m0').first : super + end + + def to_hash + keys = Gitlab::Git::Diff::SERIALIZE_KEYS - [:diff] + + as_json(only: keys).merge(diff: diff).with_indifferent_access + end end |