gitlab-org--gitlab-foss/app
Robert Speicher 13bb9ed77f Merge branch '21814-fix' into 'master'
Pull import sources from Gitlab::ImportSources

## What does this MR do?
`ApplicationSettings.create_from_defaults` defines an array of import sources, but we should be pulling them from `Gitlab::ImportSources.options` since that's what they're validated against.

## What are the relevant issue numbers?

Closes #21814

See merge request !6293
2016-09-10 15:54:51 +00:00
..
assets Merge branch '20300-restore-comments' into 'master' 2016-09-09 13:37:17 +00:00
controllers Merge branch 'add-remember-option-u2f' into 'master' 2016-09-09 18:42:11 +00:00
finders Use PipelinesFinder in Pipelines API 2016-09-07 15:38:03 +02:00
helpers Merge branch 'gitlab-workhorse-safeties' into 'master' 2016-09-09 11:33:08 +00:00
mailers
models Merge branch '21814-fix' into 'master' 2016-09-10 15:54:51 +00:00
policies Project tools visibility level 2016-09-01 11:47:59 -03:00
services Refresh todos count cache when an Issue/MR is deleted 2016-09-08 15:50:07 -03:00
uploaders
validators
views Merge branch 'add-remember-option-u2f' into 'master' 2016-09-09 18:42:11 +00:00
workers Optimized event pruning query to avoid two queries. 2016-09-07 12:55:25 -07:00