diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-04-11 22:14:30 +0200 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-04-11 22:14:30 +0200 |
| commit | c898dc00dca49e8a073421cbfe0765254e52fed8 (patch) | |
| tree | 3b2063a0ad66f35308212cce9dcbcbc7839eb590 | |
| parent | 0f31acd0ec9b8a6ccfe9c6b0038736ad724814c0 (diff) | |
| download | gitlab-ce-c898dc00dca49e8a073421cbfe0765254e52fed8.tar.gz | |
Make the db and statemachine default is the same
| -rw-r--r-- | app/models/merge_request_diff.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 0684461add7..9febdb44994 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -26,7 +26,7 @@ class MergeRequestDiff < ActiveRecord::Base delegate :target_branch, :source_branch, to: :merge_request, prefix: nil - state_machine :state, initial: :empty do + state_machine :state, initial: :collected do state :collected state :timeout state :overflow_commits_safe_size |