Merge branch 'master' into 'api-notes-entity-fields'

CHANGELOG.md

VERSION

app/assets/images/icon-merge-request-unmerged.svg

app/assets/images/mailers/gitlab_footer_logo.gif

app/assets/images/mailers/gitlab_header_logo.gif

...cripts/environments/components/environment_actions.js.es6

...vascripts/environments/components/environment_item.js.es6

app/assets/stylesheets/pages/environments.scss

app/assets/stylesheets/pages/issues.scss

app/controllers/concerns/issuable_collections.rb

app/controllers/concerns/issues_action.rb

app/controllers/concerns/merge_requests_action.rb

app/controllers/projects/issues_controller.rb

app/controllers/projects/merge_requests_controller.rb

app/helpers/emails_helper.rb

app/mailers/emails/pipelines.rb

app/models/concerns/issuable.rb

app/models/merge_requests_closing_issues.rb

app/views/layouts/mailer.html.haml

app/views/layouts/mailer.text.haml