Merge master into issue_12758

CHANGELOG

Gemfile

Gemfile.lock

app/assets/javascripts/LabelManager.js.coffee

app/assets/javascripts/application.js.coffee

app/assets/javascripts/awards_handler.coffee

...assets/javascripts/blob/blob_gitignore_selector.js.coffee

...ssets/javascripts/blob/blob_gitignore_selectors.js.coffee

app/assets/javascripts/blob/blob_license_selector.js.coffee

app/assets/javascripts/blob/blob_license_selectors.js.coffee

app/assets/javascripts/blob/edit_blob.js.coffee

app/assets/javascripts/blob/template_selector.js.coffee

app/assets/javascripts/dispatcher.js.coffee

app/assets/javascripts/due_date_select.js.coffee

app/assets/javascripts/gfm_auto_complete.js.coffee

app/assets/javascripts/labels_select.js.coffee

app/assets/javascripts/lib/common_utils.js.coffee

app/assets/javascripts/merge_request.js.coffee

app/assets/javascripts/merge_request_tabs.js.coffee

app/assets/javascripts/merged_buttons.js.coffee