diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-06-25 23:06:10 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-06-25 23:06:10 +0300 |
| commit | ebd8e4333a263138abf2113dd315a97352851cbe (patch) | |
| tree | 4e4975eab778d490c20c9252785761a1d78fae26 /app/controllers/application_controller.rb | |
| parent | 2bac2918b2d6f12d94f739f4b6865b9e9221c642 (diff) | |
WIP: Add support for Bitbucket Server imports
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 21cc6dfdd16..f864fbcaa43 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -30,7 +30,7 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception, prepend: true helper_method :can? - helper_method :import_sources_enabled?, :github_import_enabled?, :gitea_import_enabled?, :github_import_configured?, :gitlab_import_enabled?, :gitlab_import_configured?, :bitbucket_import_enabled?, :bitbucket_import_configured?, :google_code_import_enabled?, :fogbugz_import_enabled?, :git_import_enabled?, :gitlab_project_import_enabled? + helper_method :import_sources_enabled?, :github_import_enabled?, :gitea_import_enabled?, :github_import_configured?, :gitlab_import_enabled?, :gitlab_import_configured?, :bitbucket_import_enabled?, :bitbucket_import_configured?, :google_code_import_enabled?, :fogbugz_import_enabled?, :git_import_enabled?, :gitlab_project_import_enabled?, :bitbucket_server_import_enabled? rescue_from Encoding::CompatibilityError do |exception| log_exception(exception) @@ -307,6 +307,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 |