summaryrefslogtreecommitdiff
path: root/app/models/merge_request_diff.rb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-05-10 13:58:10 -0500
committerKamil Trzcinski <ayufan@ayufan.eu>2016-05-10 13:58:10 -0500
commitdb25c17036b47cc4ee0bd08b7dc70def25d9a3c9 (patch)
treee3cbcf3f34bf1ff043d5947bc0da434da8a4c0ca /app/models/merge_request_diff.rb
parent74520f23db51c95b4aea8856fb51c4246785f776 (diff)
parente3911a1896d8725f7b739929b7de1ab09917eed5 (diff)
downloadgitlab-ce-db25c17036b47cc4ee0bd08b7dc70def25d9a3c9.tar.gz
Merge remote-tracking branch 'origin/master' into send-incremental-build-log
Diffstat (limited to 'app/models/merge_request_diff.rb')
-rw-r--r--app/models/merge_request_diff.rb15
1 files changed, 0 insertions, 15 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index 8951e92a0b8..eb42c07b9b9 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -1,18 +1,3 @@
-# == Schema Information
-#
-# Table name: merge_request_diffs
-#
-# id :integer not null, primary key
-# state :string
-# st_commits :text
-# st_diffs :text
-# merge_request_id :integer not null
-# created_at :datetime
-# updated_at :datetime
-# base_commit_sha :string
-# real_size :string
-#
-
class MergeRequestDiff < ActiveRecord::Base
include Sortable