Add ability to disable manifest import
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
68f8ae26bf
commit
98d29f6e78
|
@ -30,7 +30,13 @@ 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?,
|
||||
:manifest_import_enabled?
|
||||
|
||||
rescue_from Encoding::CompatibilityError do |exception|
|
||||
log_exception(exception)
|
||||
|
@ -351,6 +357,10 @@ class ApplicationController < ActionController::Base
|
|||
Gitlab::CurrentSettings.import_sources.include?('gitlab_project')
|
||||
end
|
||||
|
||||
def manifest_import_enabled?
|
||||
Gitlab::CurrentSettings.import_sources.include?('manifest')
|
||||
end
|
||||
|
||||
# U2F (universal 2nd factor) devices need a unique identifier for the application
|
||||
# to perform authentication.
|
||||
# https://developers.yubico.com/U2F/App_ID.html
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
class Import::ManifestController < Import::BaseController
|
||||
before_action :verify_import_enabled
|
||||
before_action :ensure_import_vars, only: [:create, :status]
|
||||
|
||||
def new
|
||||
|
@ -80,4 +81,8 @@ class Import::ManifestController < Import::BaseController
|
|||
.where(creator_id: current_user)
|
||||
.includes(:import_state)
|
||||
end
|
||||
|
||||
def verify_import_enabled
|
||||
render_404 unless manifest_import_enabled?
|
||||
end
|
||||
end
|
||||
|
|
|
@ -38,13 +38,14 @@
|
|||
= link_to new_import_gitea_path, class: 'btn import_gitea' do
|
||||
= custom_icon('go_logo')
|
||||
Gitea
|
||||
- if git_import_enabled?
|
||||
%div
|
||||
%div
|
||||
- if git_import_enabled?
|
||||
%button.btn.js-toggle-button.js-import-git-toggle-button{ type: "button", data: { toggle_open_class: 'active' } }
|
||||
= icon('git', text: 'Repo by URL')
|
||||
%div
|
||||
%div
|
||||
- if manifest_import_enabled?
|
||||
%button.btn{ type: "button" }
|
||||
= icon('git', text: 'Manifest file')
|
||||
= icon('file', text: 'Manifest file')
|
||||
|
||||
.js-toggle-content.toggle-import-form{ class: ('hide' if active_tab != 'import') }
|
||||
= form_for @project, html: { class: 'new_project' } do |f|
|
||||
|
|
Loading…
Reference in New Issue