Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq

app/assets/javascripts/merge_requests.js.coffee

app/controllers/projects/merge_requests_controller.rb

app/models/merge_request.rb

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

features/project/merge_requests.feature

features/steps/project/project_merge_requests.rb

lib/gitlab/satellite/merge_action.rb

spec/controllers/merge_requests_controller_spec.rb

spec/lib/gitlab/satellite/merge_action_spec.rb