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

Gemfile

Gemfile.lock

app/assets/javascripts/merge_requests.js.coffee

app/contexts/merge_requests_load_context.rb

app/controllers/merge_requests_controller.rb

app/controllers/milestones_controller.rb

app/helpers/issues_helper.rb

app/helpers/merge_requests_helper.rb

app/models/concerns/issuable.rb

app/models/issue.rb

app/models/merge_request.rb

app/models/milestone.rb

app/models/project.rb

app/observers/activity_observer.rb

app/observers/issue_observer.rb

app/observers/merge_request_observer.rb

app/views/issues/_show.html.haml

app/views/issues/show.html.haml

app/views/merge_requests/_show.html.haml

app/views/merge_requests/show/_mr_accept.html.haml