diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-07-07 22:41:37 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-07-07 22:41:37 +0000 |
| commit | 7414f5407b6252ea91cbd9b2210e993a1a795ba0 (patch) | |
| tree | 8cf840921e96c60058a34c4278bcf23078ac6a3a | |
| parent | e7d18a17b4d39dfd0bd52241cac622101995da7e (diff) | |
| parent | f8c0ccb1a15f12048fabc99d63e3436732bf4cd9 (diff) | |
| download | gitlab-ce-7414f5407b6252ea91cbd9b2210e993a1a795ba0.tar.gz | |
Merge branch 'username-password-stripped-from-import-url-fix' into 'master'
Username and password are no longer stripped from import url on import
See merge request !12725
| -rw-r--r-- | app/models/project.rb | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/username-password-stripped-from-import-url-fix.yml | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 74c15d2508b..d0e02e4e585 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -536,6 +536,11 @@ class Project < ActiveRecord::Base ProjectCacheWorker.perform_async(self.id) end + remove_import_data + end + + # This method is overriden in EE::Project model + def remove_import_data import_data&.destroy end diff --git a/changelogs/unreleased/username-password-stripped-from-import-url-fix.yml b/changelogs/unreleased/username-password-stripped-from-import-url-fix.yml new file mode 100644 index 00000000000..571279d3dc7 --- /dev/null +++ b/changelogs/unreleased/username-password-stripped-from-import-url-fix.yml @@ -0,0 +1,4 @@ +--- +title: Username and password are no longer stripped from import url on mirror update +merge_request: 12725 +author: |