Merge branch 'jej-backport-active-tense-specs' into 'master'

spec/features/notes_on_merge_requests_spec.rb

spec/helpers/diff_helper_spec.rb

spec/javascripts/awards_handler_spec.js

spec/lib/gitlab/diff/highlight_spec.rb

spec/lib/gitlab/diff/parallel_diff_spec.rb

spec/lib/gitlab/highlight_spec.rb

spec/lib/gitlab/ldap/access_spec.rb

spec/requests/api/builds_spec.rb

spec/requests/api/groups_spec.rb

spec/requests/api/projects_spec.rb

spec/requests/ci/api/builds_spec.rb

spec/services/event_create_service_spec.rb

spec/services/merge_requests/close_service_spec.rb

spec/tasks/gitlab/mail_google_schema_whitelisting.rb