summaryrefslogtreecommitdiff
path: root/app/models/concerns/diff_file.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-05-30 10:33:43 +0100
committerPhil Hughes <me@iamphill.com>2018-05-30 10:33:43 +0100
commitc760965079fce0f020980987794ea61c86eb09ff (patch)
tree32bbac523c665a785eaaab85d9be305c02d8ce68 /app/models/concerns/diff_file.rb
parent323e402e21a643da22714bdede3cc6e248ba2cf4 (diff)
parentfd79df64c5411308e67a62b4c02a07f5317ddec1 (diff)
downloadgitlab-ce-c760965079fce0f020980987794ea61c86eb09ff.tar.gz
Merge branch 'master' into ide-list-merge-requests
Diffstat (limited to 'app/models/concerns/diff_file.rb')
-rw-r--r--app/models/concerns/diff_file.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/app/models/concerns/diff_file.rb b/app/models/concerns/diff_file.rb
new file mode 100644
index 00000000000..72332072012
--- /dev/null
+++ b/app/models/concerns/diff_file.rb
@@ -0,0 +1,9 @@
+module DiffFile
+ extend ActiveSupport::Concern
+
+ def to_hash
+ keys = Gitlab::Git::Diff::SERIALIZE_KEYS - [:diff]
+
+ as_json(only: keys).merge(diff: diff).with_indifferent_access
+ end
+end