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/controllers/application_controller.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/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 783831748a7..7228a2f1715 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -35,6 +35,7 @@ class ApplicationController < ActionController::Base :gitea_import_enabled?, :github_import_configured?, :gitlab_import_enabled?, :gitlab_import_configured?, :bitbucket_import_enabled?, :bitbucket_import_configured?, + :bitbucket_server_import_enabled?, :google_code_import_enabled?, :fogbugz_import_enabled?, :git_import_enabled?, :gitlab_project_import_enabled?, :manifest_import_enabled? @@ -337,6 +338,10 @@ class ApplicationController < ActionController::Base !Gitlab::CurrentSettings.import_sources.empty? end + def bitbucket_server_import_enabled? + Gitlab::CurrentSettings.import_sources.include?('bitbucket_server') + end + def github_import_enabled? Gitlab::CurrentSettings.import_sources.include?('github') end |