diff --git a/config/locales/en.yml b/config/locales/en.yml index 211e18da3..649ec358a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -175,7 +175,7 @@ en: merge_request: attributes: absorbing_organisation_id: - blank: "Select the organisation absorbing the others" + blank: "Select the absorbing organisation" merge_date: blank: "Enter a merge date" invalid: "Enter a valid merge date" diff --git a/spec/requests/merge_requests_controller_spec.rb b/spec/requests/merge_requests_controller_spec.rb index 27cace08e..899def900 100644 --- a/spec/requests/merge_requests_controller_spec.rb +++ b/spec/requests/merge_requests_controller_spec.rb @@ -246,7 +246,7 @@ RSpec.describe MergeRequestsController, type: :request do it "renders the error" do request - expect(page).to have_content("Select the organisation absorbing the others") + expect(page).to have_content("Select the absorbing organisation") end it "does not update the request" do