diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-08-06 17:32:12 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-08-06 17:32:12 +0000 |
| commit | d737abc537476bf2b500f550b0c733d22f338cf1 (patch) | |
| tree | 4b865101f1e4eab3ceedd75973098de9f18ac4b6 /app/models/project.rb | |
| parent | 0ffd79319ffc06f9ab5dcfce4f20a4da2f739577 (diff) | |
| parent | ee851e58490004f985f914f3cfa715b03cdf4982 (diff) | |
| download | gitlab-ce-d737abc537476bf2b500f550b0c733d22f338cf1.tar.gz | |
Merge branch 'sh-support-bitbucket-server-import' into 'master'
Add support for Bitbucket Server imports
Closes #25393
See merge request gitlab-org/gitlab-ce!20164
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index cb4d2610e0d..327ee901054 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -654,6 +654,8 @@ class Project < ActiveRecord::Base project_import_data.credentials ||= {} project_import_data.credentials = project_import_data.credentials.merge(credentials) end + + project_import_data end def import? |