Merge remote-tracking branch 'ce/master' into ce-to-ee

CHANGELOG.md

app/assets/javascripts/activities.js

app/assets/javascripts/application.js

app/assets/javascripts/build.js

app/assets/javascripts/compare.js

app/assets/javascripts/diff.js

app/assets/javascripts/dispatcher.js.es6

app/assets/javascripts/gfm_auto_complete.js.es6

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

app/assets/javascripts/lib/utils/datetime_utility.js

app/assets/javascripts/lib/utils/timeago.js

app/assets/javascripts/merge_request_widget.js.es6

app/assets/javascripts/milestone_select.js

app/assets/stylesheets/framework/buttons.scss

app/assets/stylesheets/framework/dropdowns.scss

app/assets/stylesheets/framework/header.scss

app/assets/stylesheets/framework/nav.scss

app/assets/stylesheets/framework/sidebar.scss

app/assets/stylesheets/pages/builds.scss

app/assets/stylesheets/pages/diff.scss