Automatic merge of gitlab-org/gitlab-ce master

app/models/deployment.rb

@@ -179,7 +179,7 @@ class Deployment < ApplicationRecord
   end
 
   def has_metrics?
-    prometheus_adapter&.can_query? && success?
+    success? && prometheus_adapter&.can_query?
   end
 
   def metrics

app/models/environment.rb

@@ -155,7 +155,7 @@ class Environment < ApplicationRecord
   end
 
   def has_terminals?
-    deployment_platform.present? && available? && last_deployment.present?
+    available? && deployment_platform.present? && last_deployment.present?
   end
 
   def terminals
@@ -163,7 +163,7 @@ class Environment < ApplicationRecord
   end
 
   def has_metrics?
-    prometheus_adapter&.can_query? && available?
+    available? && prometheus_adapter&.can_query?
   end
 
   def metrics

app/models/project.rb

@@ -55,6 +55,8 @@ class Project < ApplicationRecord
   VALID_MIRROR_PORTS = [22, 80, 443].freeze
   VALID_MIRROR_PROTOCOLS = %w(http https ssh git).freeze
 
+  ignore_column :import_status, :import_jid, :import_error
+
   cache_markdown_field :description, pipeline: :description
 
   delegate :feature_available?, :builds_enabled?, :wiki_enabled?,