Commit a25ad6e7 authored by Thong Kuah's avatar Thong Kuah Committed by Stan Hu

Merge branch 'sh-fix-import-url-update' into 'master'

Fix project settings not being able to update

Closes #62708

See merge request gitlab-org/gitlab-ce!29097
parent 09221d50
......@@ -2,6 +2,8 @@
module ImportUrlParams
def import_url_params
return {} unless params.dig(:project, :import_url).present?
{ import_url: import_params_to_full_url(params[:project]) }
end
......
---
title: Fix project settings not being able to update
merge_request: 29097
author:
type: fixed
......@@ -8,6 +8,18 @@ describe ImportUrlParams do
controller.import_url_params
end
context 'empty URL' do
let(:params) do
ActionController::Parameters.new(project: {
title: 'Test'
})
end
it 'returns empty hash' do
expect(import_url_params).to eq({})
end
end
context 'url and password separately provided' do
let(:params) do
ActionController::Parameters.new(project: {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment