Browse Source

Make the details page the merge requests' show view

pull/2565/head
Manny Dinssa 2 years ago
parent
commit
b261bf8a27
  1. 3
      app/controllers/merge_requests_controller.rb
  2. 2
      app/views/merge_requests/_merge_request_list.html.erb
  3. 0
      app/views/merge_requests/show.html.erb

3
app/controllers/merge_requests_controller.rb

@ -32,9 +32,8 @@ class MergeRequestsController < ApplicationController
end end
end end
def details def show
@merge_request = MergeRequest.find(params[:id]) @merge_request = MergeRequest.find(params[:id])
render :details
end end
def update_organisations def update_organisations

2
app/views/merge_requests/_merge_request_list.html.erb

@ -48,7 +48,7 @@
<% row.with_cell(html_attributes: { <% row.with_cell(html_attributes: {
scope: "row", scope: "row",
}) do %> }) 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 %> <% end %>
<% end %> <% end %>

0
app/views/merge_requests/details.html.erb → app/views/merge_requests/show.html.erb

Loading…
Cancel
Save