diff options
| author | Andrew8xx8 <avk@8xx8.ru> | 2013-02-15 12:27:13 +0400 |
|---|---|---|
| committer | Andrew8xx8 <avk@8xx8.ru> | 2013-02-18 14:43:49 +0400 |
| commit | 8db3920c01dfa4cf6c83afd67418bab8cb785bac (patch) | |
| tree | 29f8c87b9da33a97d9ff5dbbc6ff3b785f577474 /spec/models/merge_request_spec.rb | |
| parent | 26d4574adacd4f7a06d65f9ecd7a53d6fddbfa7a (diff) | |
| download | gitlab-ce-8db3920c01dfa4cf6c83afd67418bab8cb785bac.tar.gz | |
State renamed to merge_status
Diffstat (limited to 'spec/models/merge_request_spec.rb')
| -rw-r--r-- | spec/models/merge_request_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 41f4ede5d89..6f3448135d4 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -15,7 +15,7 @@ # st_commits :text(2147483647) # st_diffs :text(2147483647) # merged :boolean default(FALSE), not null -# state :integer default(1), not null +# merge_status :integer default(1), not null # milestone_id :integer # |