From b261bf8a27545e2db5c7172b4eb0fe94c5489a61 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Mon, 12 Aug 2024 16:03:23 +0100
Subject: [PATCH] Make the details page the merge requests' show view

---
 app/controllers/merge_requests_controller.rb                 | 3 +--
 app/views/merge_requests/_merge_request_list.html.erb        | 2 +-
 app/views/merge_requests/{details.html.erb => show.html.erb} | 0
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename app/views/merge_requests/{details.html.erb => show.html.erb} (100%)

diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb
index 43304742f..83b7b158d 100644
--- a/app/controllers/merge_requests_controller.rb
+++ b/app/controllers/merge_requests_controller.rb
@@ -32,9 +32,8 @@ class MergeRequestsController < ApplicationController
     end
   end
 
-  def details
+  def show
     @merge_request = MergeRequest.find(params[:id])
-    render :details
   end
 
   def update_organisations
diff --git a/app/views/merge_requests/_merge_request_list.html.erb b/app/views/merge_requests/_merge_request_list.html.erb
index 066084f90..99577bdc3 100644
--- a/app/views/merge_requests/_merge_request_list.html.erb
+++ b/app/views/merge_requests/_merge_request_list.html.erb
@@ -48,7 +48,7 @@
             <% row.with_cell(html_attributes: {
               scope: "row",
             }) do %>
-              <%= govuk_link_to("View details", "/merge-request/#{merge_request.id}/details") %>
+              <%= govuk_link_to("View details", "/merge-request/#{merge_request.id}") %>
             <% end %>
           <% end %>
         <% end %>
diff --git a/app/views/merge_requests/details.html.erb b/app/views/merge_requests/show.html.erb
similarity index 100%
rename from app/views/merge_requests/details.html.erb
rename to app/views/merge_requests/show.html.erb