Merge branch 'master' into rubocop-for-tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/issues_spec.rb
	spec/models/forked_project_link_spec.rb
	spec/models/hooks/service_hook_spec.rb
	spec/models/hooks/web_hook_spec.rb
	spec/models/project_services/hipchat_service_spec.rb
	spec/requests/api/project_members_spec.rb
	spec/requests/api/projects_spec.rb
	spec/requests/api/system_hooks_spec.rb
	spec/services/archive_repository_service_spec.rb
	spec/support/matchers.rb
	spec/tasks/gitlab/backup_rake_spec.rb

1 files changed, 4 insertions, 4 deletions

diff --git a/spec/lib/gitlab/google_code_import/importer_spec.rb b/spec/lib/gitlab/google_code_import/importer_spec.rb
index 3879a6ab898..c53ddeb87b5 100644
--- a/spec/lib/gitlab/google_code_import/importer_spec.rb
+++ b/spec/lib/gitlab/google_code_import/importer_spec.rb
@@ -24,7 +24,7 @@ describe Gitlab::GoogleCodeImport::Importer do
       subject.execute
 
       %w(New NeedInfo Accepted Wishlist Started Fixed Invalid Duplicate WontFix Incomplete).each do |status|
-        expect(project.labels.find_by(name: "Status: #{status}")).to_not be_nil
+        expect(project.labels.find_by(name: "Status: #{status}")).not_to be_nil
       end
     end
 
@@ -38,7 +38,7 @@ describe Gitlab::GoogleCodeImport::Importer do
         Component-Systray Component-Clock Component-Launcher Component-Tint2conf Component-Docs Component-New
       ).each do |label|
         label.sub!("-", ": ")
-        expect(project.labels.find_by(name: label)).to_not be_nil
+        expect(project.labels.find_by(name: label)).not_to be_nil
       end
     end
 
@@ -46,7 +46,7 @@ describe Gitlab::GoogleCodeImport::Importer do
       subject.execute
 
       issue = project.issues.first
-      expect(issue).to_not be_nil
+      expect(issue).not_to be_nil
       expect(issue.iid).to eq(169)
       expect(issue.author).to eq(project.creator)
       expect(issue.assignee).to eq(mapped_user)
@@ -71,7 +71,7 @@ describe Gitlab::GoogleCodeImport::Importer do
       subject.execute
 
       note = project.issues.first.notes.first
-      expect(note).to_not be_nil
+      expect(note).not_to be_nil
       expect(note.note).to include("Comment 1")
       expect(note.note).to include("@#{mapped_user.username}")
       expect(note.note).to include("November 18, 2009 05:14")