summaryrefslogtreecommitdiffstats
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorJohan Sørensen <johan@johansorensen.com>2009-08-25 12:59:19 +0200
committerJohan Sørensen <johan@johansorensen.com>2009-08-25 13:00:39 +0200
commit59803f2565e0c5264d0fda2c600952b36d0aca2a (patch)
tree677c0f4b69525b87de63399180ce0e136c756159 /app/models/merge_request.rb
parent7bb513c1f2202bd8e6f0a72b85b83d68ef69d338 (diff)
downloadgitorious-mainline-outdated-59803f2565e0c5264d0fda2c600952b36d0aca2a.zip
gitorious-mainline-outdated-59803f2565e0c5264d0fda2c600952b36d0aca2a.tar.gz
gitorious-mainline-outdated-59803f2565e0c5264d0fda2c600952b36d0aca2a.tar.bz2
Be able to set a default MergeRequestStatus
And use that as the default status for all new merge requests
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb14
1 files changed, 11 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 8e78643..a76e799 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -341,11 +341,19 @@ class MergeRequest < ActiveRecord::Base
def publish_notification
publish :mirror_merge_request, {:merge_request_id => to_param}.to_json
end
-
+
+ def default_status
+ target_repository.project.merge_request_statuses.default
+ end
def confirmed_by_user
- self.status = STATUS_OPEN
- self.status_tag = "Open"
+ if default_status
+ self.status = default_status.state
+ self.status_tag = default_status.name
+ else
+ self.status = STATUS_OPEN
+ self.status_tag = "Open"
+ end
save
publish_notification
notify_subscribers_about_creation