Browse Source

Move merge request related views

pull/2565/head
Manny Dinssa 2 years ago
parent
commit
c07c705b7c
  1. 1
      app/controllers/organisations_controller.rb
  2. 0
      app/views/merge_requests/_merge_request_list.html.erb
  3. 0
      app/views/merge_requests/merge_request.html.erb
  4. 2
      app/views/organisations/index.html.erb

1
app/controllers/organisations_controller.rb

@ -238,6 +238,7 @@ class OrganisationsController < ApplicationController
def merge_request
@merge_request = MergeRequest.new
render "merge_requests/merge_request"
end
def data_sharing_agreement

0
app/views/organisations/_merge_request_list.html.erb → app/views/merge_requests/_merge_request_list.html.erb

0
app/views/organisations/merge_request.html.erb → app/views/merge_requests/merge_request.html.erb

2
app/views/organisations/index.html.erb

@ -16,7 +16,7 @@
<% end %>
<% c.with_tab(label: "Merge requests") do %>
<%= govuk_button_link_to "Create new merge request", "/organisations/#{current_user.organisation_id}/merge-request", html: { method: :get } %>
<%= render partial: "merge_request_list", locals: { merge_requests: @merge_requests, title: "Merge requests", pagy: @pagy, searched: @searched, item_label:, total_count: @total_count } %>
<%= render partial: "merge_requests/merge_request_list", locals: { merge_requests: @merge_requests, title: "Merge requests", pagy: @pagy, searched: @searched, item_label:, total_count: @total_count } %>
<% end %>
<% end %>
</div>

Loading…
Cancel
Save