Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAndrew8xx8 <avk@8xx8.ru>2013-02-18 13:07:49 +0400
committerAndrew8xx8 <avk@8xx8.ru>2013-02-18 14:43:50 +0400
commit29f70acc987abe0b188ef187c70f179088d79589 (patch)
treeb58731491782fe569b58f1fd1648dbd4b94cd18f /app
parentb45e9aefd3207c00f9d83a0cbfcca457c9562a59 (diff)
Merge Request uses StateMachine now
Diffstat (limited to 'app')
-rw-r--r--app/models/merge_request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 67f3fb5162a..a980fac6f90 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -25,7 +25,7 @@ class MergeRequest < ActiveRecord::Base
include Issuable
attr_accessible :title, :assignee_id, :target_branch, :source_branch, :milestone_id,
- :author_id_of_changes
+ :author_id_of_changes, :state_event
attr_accessor :should_remove_source_branch