Merge commit 'master' into discussions

Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb

1 files changed, 2 insertions, 0 deletions

diff --git a/script/check b/script/check
new file mode 100755
index 00000000000..d2eb4a2f6d8
--- /dev/null
+++ b/script/check
@@ -0,0 +1,2 @@
+#!/bin/sh
+sudo -u gitlab -H bundle exec rake gitlab:check RAILS_ENV=production