summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-10-19 11:49:07 -0200
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-10-19 14:58:28 -0200
commitfc2c64fcdf913a37f987ab5e5626ef9bb9e8b854 (patch)
tree80517a6fa33f41b305449efbbff0df8ed50dd4f3 /app/models/merge_request.rb
parent2ed51e7e257aaacba650397cba3191415d032b00 (diff)
downloadgitlab-ce-fc2c64fcdf913a37f987ab5e5626ef9bb9e8b854.tar.gz
Add self.project_foreign_key on both Issue and MergeRequest
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index fedc35102ef..0cc0b3c2a0e 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -137,6 +137,10 @@ class MergeRequest < ActiveRecord::Base
reference.to_i > 0 && reference.to_i <= Gitlab::Database::MAX_INT_VALUE
end
+ def self.project_foreign_key
+ 'target_project_id'
+ end
+
# Returns all the merge requests from an ActiveRecord:Relation.
#
# This method uses a UNION as it usually operates on the result of