Add latest changes from gitlab-org/gitlab@master

3 files changed, 4 insertions, 3 deletions

diff --git a/app/services/environments/auto_stop_service.rb b/app/services/environments/auto_stop_service.rb
index 6eef8138493..ee7f25a4d76 100644
--- a/app/services/environments/auto_stop_service.rb
+++ b/app/services/environments/auto_stop_service.rb
@@ -30,7 +30,7 @@ module Environments
     def stop_in_batch
       environments = Environment.auto_stoppable(BATCH_SIZE)
 
-      return false unless environments.exists? && Feature.enabled?(:auto_stop_environments)
+      return false unless environments.exists? && Feature.enabled?(:auto_stop_environments, default_enabled: true)
 
       Ci::StopEnvironmentsService.execute_in_batch(environments)
     end
diff --git a/app/services/metrics/dashboard/system_dashboard_service.rb b/app/services/metrics/dashboard/system_dashboard_service.rb
index bef65dbe1c2..aa8421e10d5 100644
--- a/app/services/metrics/dashboard/system_dashboard_service.rb
+++ b/app/services/metrics/dashboard/system_dashboard_service.rb
@@ -11,6 +11,7 @@ module Metrics
       SEQUENCE = [
         STAGES::CommonMetricsInserter,
         STAGES::ProjectMetricsInserter,
+        STAGES::ProjectMetricsDetailsInserter,
         STAGES::EndpointInserter,
         STAGES::Sorter
       ].freeze
diff --git a/app/services/snippets/create_service.rb b/app/services/snippets/create_service.rb
index 9e87bebbe4e..7ded185a6f9 100644
--- a/app/services/snippets/create_service.rb
+++ b/app/services/snippets/create_service.rb
@@ -24,8 +24,8 @@ module Snippets
       spam_check(snippet, current_user)
 
       snippet_saved = snippet.with_transaction_returning_status do
-        if snippet.save && snippet.store_mentions!
-          create_repository_for(snippet, current_user)
+        (snippet.save && snippet.store_mentions!).tap do |saved|
+          create_repository_for(snippet, current_user) if saved
         end
       end