summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-21 12:34:02 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-21 12:34:02 +0300
commit8dd37afe3489ef46e14b33c66d9b80e913540f62 (patch)
tree1375ec1333b451186ff3661aee54465739ca6c80 /app/models/merge_request.rb
parentfb492386c5323c4996d05a63ba8d93db6ed07f93 (diff)
downloadgitlab-ce-8dd37afe3489ef46e14b33c66d9b80e913540f62.tar.gz
Reannotate
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb31
1 files changed, 16 insertions, 15 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 190f6ab15f4..0bb4b231f62 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -2,21 +2,22 @@
#
# Table name: merge_requests
#
-# id :integer not null, primary key
-# target_project_id :integer not null
-# target_branch :string(255) not null
-# source_project_id :integer not null
-# source_branch :string(255) not null
-# author_id :integer
-# assignee_id :integer
-# title :string(255)
-# created_at :datetime
-# updated_at :datetime
-# st_commits :text(2147483647)
-# st_diffs :text(2147483647)
-# milestone_id :integer
-# state :string(255)
-# merge_status :string(255)
+# id :integer not null, primary key
+# target_branch :string(255) not null
+# source_branch :string(255) not null
+# source_project_id :integer not null
+# author_id :integer
+# assignee_id :integer
+# title :string(255)
+# created_at :datetime not null
+# updated_at :datetime not null
+# st_commits :text(2147483647)
+# st_diffs :text(2147483647)
+# milestone_id :integer
+# state :string(255)
+# merge_status :string(255)
+# target_project_id :integer not null
+# iid :integer
#
require Rails.root.join("app/models/commit")