diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-05 18:18:49 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-04-05 18:18:49 +0300 |
| commit | 082bf1c6ee97aefc9c53e7462cf870ce8ce0ad2b (patch) | |
| tree | 68f6bbf147404ee8c273170c41e89882299969ea /app/models | |
| parent | b2a7faa5a9223811884676bb1004f97fb8a18a54 (diff) | |
| parent | 902cec12b5b531434ccf7ecf6df22ddb4249c253 (diff) | |
Merge branch 'bvl-override-import-params' into 'master'
Allow passing params to import API to override project attributes
Closes gitlab-ee#4788
See merge request gitlab-org/gitlab-ce!18086
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index ea9df9b10ef..1b29cbf28d2 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -637,7 +637,7 @@ class Project < ActiveRecord::Base end def create_or_update_import_data(data: nil, credentials: nil) - return unless import_url.present? && valid_import_url? + return if data.nil? && credentials.nil? project_import_data = import_data || build_import_data if data @@ -1487,6 +1487,7 @@ class Project < ActiveRecord::Base remove_import_jid update_project_counter_caches after_create_default_branch + refresh_markdown_cache! end def update_project_counter_caches |