State renamed to merge_status

2013-02-15 12:27:13 +04:00 · 2013-02-15 12:27:13 +04:00 · 8db3920c01
commit 8db3920c01
parent 26d4574ada
5 changed files with 19 additions and 14 deletions
--- 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
 #