Improve performance of finding last deployed environment

5 files changed, 6 insertions, 6 deletions

diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 1bdb8d45984..c88095abb3a 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -31,7 +31,7 @@ class Projects::BlobController < Projects::ApplicationController
 
   def show
     branch_name = @ref if @repository.branch_exists?(@ref)
-    @environment = @project.latest_environment_for(@commit, ref: branch_name)
+    @environment = @project.environments_for(commit: @commit, ref: branch_name).last
     @environment = nil unless can?(current_user, :read_environment, @environment)
   end
 
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 08817afa1e9..5bcc545462f 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -96,7 +96,7 @@ class Projects::CommitController < Projects::ApplicationController
     @diffs = commit.diffs(opts)
     @notes_count = commit.notes.count
 
-    @environment = @project.latest_environment_for(@commit)
+    @environment = @project.environments_for(commit: @commit).last
     @environment = nil unless can?(current_user, :read_environment, @environment)
   end
 
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index 6c94a79f842..142df1ba4e9 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -58,7 +58,7 @@ class Projects::CompareController < Projects::ApplicationController
       @diffs = @compare.diffs(diff_options)
 
       branch_name = @head_ref if @repository.branch_exists?(@head_ref)
-      @environment = @project.latest_environment_for(@commit, ref: branch_name)
+      @environment = @project.environments_for(commit: @commit, ref: branch_name).last
       @environment = nil unless can?(current_user, :read_environment, @environment)
 
       @diff_notes_disabled = true
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index 87cc36253f1..e2abcd45b5f 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -10,7 +10,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
 
   def index
     @scope = params[:scope]
-    @environments = project.environments
+    @environments = project.environments.includes(:last_deployment)
 
     respond_to do |format|
       format.html
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 6a6d24db35d..a84e15de99a 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -103,7 +103,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       end
     end
 
-    @environment = @merge_request.latest_environment
+    @environment = @merge_request.environments.last
     @environment = nil unless can?(current_user, :read_environment, @environment)
 
     respond_to do |format|
@@ -248,7 +248,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
                  end
         @diff_notes_disabled = true
 
-        @environment = @merge_request.latest_environment
+        @environment = @merge_request.environments.last
         @environment = nil unless can?(current_user, :read_environment, @environment)
 
         render json: { html: view_to_html_string('projects/merge_requests/_new_diffs', diffs: @diffs, environment: @environment) }