Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 3797e794985..7a8e79fecb1 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -1541,7 +1541,7 @@ describe Gitlab::Database::MigrationHelpers do
       self.table_name = 'issues'
       self.inheritance_column = :_type_disabled
 
-      belongs_to :project
+      belongs_to :project, class_name: "::Project"
 
       has_internal_id :iid,
         scope: :project,
diff --git a/spec/lib/gitlab/query_limiting/middleware_spec.rb b/spec/lib/gitlab/query_limiting/middleware_spec.rb
index f996ea38bb9..f397843df54 100644
--- a/spec/lib/gitlab/query_limiting/middleware_spec.rb
+++ b/spec/lib/gitlab/query_limiting/middleware_spec.rb
@@ -26,7 +26,7 @@ describe Gitlab::QueryLimiting::Middleware do
             :controller,
             action_name: 'show',
             class: double(:class, name: 'UsersController'),
-            content_type: 'text/html'
+            media_type: 'text/html'
           )
         }
 
@@ -39,7 +39,7 @@ describe Gitlab::QueryLimiting::Middleware do
             :controller,
             action_name: 'show',
             class: double(:class, name: 'UsersController'),
-            content_type: 'application/json'
+            media_type: 'application/json'
           )
         }