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
This commit is contained in:
Thong Kuah 2019-06-03 23:43:56 +00:00
commit 3bce929fd1
3 changed files with 19 additions and 0 deletions

View file

@ -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

View file

@ -0,0 +1,5 @@
---
title: Fix project settings not being able to update
merge_request: 29097
author:
type: fixed

View file

@ -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: {