Merge remote-tracking branch 'upstream/master'

Gemfile

Gemfile.lock

app/assets/javascripts/note.js

app/assets/javascripts/pager.js

app/assets/stylesheets/common.scss

app/assets/stylesheets/gitlab_bootstrap.scss

app/assets/stylesheets/notes.scss

app/assets/stylesheets/sections/commits.scss

app/assets/stylesheets/sections/issues.scss

app/contexts/notes_load.rb

app/controllers/commits_controller.rb

app/controllers/merge_requests_controller.rb

app/controllers/omniauth_callbacks_controller.rb

app/controllers/refs_controller.rb

app/controllers/wikis_controller.rb

app/mailers/notify.rb

app/models/commit.rb

app/models/wiki.rb

app/observers/mailer_observer.rb

app/views/commits/_commit.html.haml