1 files changed, 2 insertions, 2 deletions
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) }