summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-13 19:22:46 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-13 19:22:46 +0100
commita237999f000526b3db5b0b5a72a665adcff29522 (patch)
tree59b42304f4de011e4f11ab8f4aab03838ab3f78a /app/models/merge_request.rb
parentf197b528ff8556d480914c7b5234addbb86b82d3 (diff)
downloadgitlab-ce-a237999f000526b3db5b0b5a72a665adcff29522.tar.gz
Annotate models
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index e81d65c2330..2eb03b8ba5b 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -20,6 +20,7 @@
# position :integer default(0)
# locked_at :datetime
# updated_by_id :integer
+# merge_error :string(255)
#
require Rails.root.join("app/models/commit")