Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

CHANGELOG

app/assets/javascripts/dispatcher.js.coffee

app/assets/javascripts/issuable_context.js.coffee

app/assets/javascripts/issuable_form.js.coffee

app/assets/javascripts/issue.js.coffee

app/assets/javascripts/merge_request.js.coffee

app/assets/stylesheets/pages/issues.scss

app/helpers/gitlab_routing_helper.rb

app/models/ability.rb

app/services/issuable_base_service.rb

app/services/issues/create_service.rb

app/services/issues/update_service.rb

app/services/merge_requests/create_service.rb

app/services/merge_requests/update_service.rb

app/views/dashboard/issues.html.haml

app/views/dashboard/merge_requests.html.haml

app/views/groups/issues.html.haml

app/views/groups/merge_requests.html.haml

app/views/projects/issues/_discussion.html.haml

app/views/projects/issues/_form.html.haml