Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine

Conflicts:
	app/models/issue.rb
	app/models/merge_request.rb

app/models/issue.rb

@@ -9,7 +9,7 @@
 #  project_id   :integer
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
-#  closed       :boolean          default(FALSE), not null
+#  state        :string           default(FALSE), not null
 #  position     :integer          default(0)
 #  branch_name  :string(255)
 #  description  :text
@@ -19,8 +19,9 @@
 class Issue < ActiveRecord::Base
   include Issuable
 
-  attr_accessible :title, :assignee_id, :closed, :position, :description,
-                  :milestone_id, :label_list, :author_id_of_changes
+  attr_accessible :title, :assignee_id, :position, :description,
+                  :milestone_id, :label_list, :author_id_of_changes,
+                  :state_event
 
   acts_as_taggable_on :labels
 
@@ -33,4 +34,20 @@ class Issue < ActiveRecord::Base
       opened.assigned(user)
     end
   end
+
+  state_machine :state, initial: :opened do
+    event :close do
+      transition [:reopened, :opened] => :closed
+    end
+
+    event :reopen do
+      transition closed: :reopened
+    end
+
+    state :opened
+
+    state :reopened
+
+    state :closed
+  end
 end