Merge branch 'master' into decouple-member-notification

CHANGELOG

Gemfile

Gemfile.lock

app/assets/javascripts/awards_handler.coffee

app/assets/javascripts/compare.js.coffee

app/assets/javascripts/gl_dropdown.js.coffee

app/assets/javascripts/merge_request_tabs.js.coffee

app/assets/javascripts/subscription.js.coffee

app/assets/stylesheets/framework/buttons.scss

app/assets/stylesheets/framework/dropdowns.scss

app/assets/stylesheets/framework/files.scss

app/assets/stylesheets/framework/timeline.scss

app/assets/stylesheets/framework/variables.scss

app/assets/stylesheets/highlight/solarized_light.scss

app/assets/stylesheets/highlight/white.scss

app/assets/stylesheets/pages/commits.scss

app/assets/stylesheets/pages/diff.scss

app/assets/stylesheets/pages/labels.scss

app/assets/stylesheets/pages/merge_requests.scss

app/assets/stylesheets/pages/note_form.scss