Make the details page the merge requests' show view

2 years ago · b261bf8a27
3 changed files with 2 additions and 3 deletions
--- 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
--- 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 %>
--- a/app/views/merge_requests/details.html.erb
+++ b/app/views/merge_requests/details.html.erb