f986b4c4e5
This MR enables rendering of PlantUML diagrams in Asciidoc documents. To add a PlantUML diagram all we need is to include a plantuml block like: ``` [plantuml, id="myDiagram", width="100px", height="100px"] -- bob -> alice : ping alice -> bob : pong -- ``` The plantuml block is substituted by an HTML img element with *src* pointing to an external PlantUML server. This MR also add a PlantUML integration section to the Administrator -> Settings page to configure the PlantUML rendering service and to enable/disable it. Closes: #17603
74 lines
2.8 KiB
Ruby
74 lines
2.8 KiB
Ruby
module Gitlab
|
|
module CurrentSettings
|
|
def current_application_settings
|
|
if RequestStore.active?
|
|
RequestStore.fetch(:current_application_settings) { ensure_application_settings! }
|
|
else
|
|
ensure_application_settings!
|
|
end
|
|
end
|
|
|
|
def ensure_application_settings!
|
|
if connect_to_db?
|
|
begin
|
|
settings = ::ApplicationSetting.current
|
|
# In case Redis isn't running or the Redis UNIX socket file is not available
|
|
rescue ::Redis::BaseError, ::Errno::ENOENT
|
|
settings = ::ApplicationSetting.last
|
|
end
|
|
|
|
settings ||= ::ApplicationSetting.create_from_defaults unless ActiveRecord::Migrator.needs_migration?
|
|
end
|
|
|
|
settings || fake_application_settings
|
|
end
|
|
|
|
def sidekiq_throttling_enabled?
|
|
current_application_settings.sidekiq_throttling_enabled?
|
|
end
|
|
|
|
def fake_application_settings
|
|
OpenStruct.new(
|
|
default_projects_limit: Settings.gitlab['default_projects_limit'],
|
|
default_branch_protection: Settings.gitlab['default_branch_protection'],
|
|
signup_enabled: Settings.gitlab['signup_enabled'],
|
|
signin_enabled: Settings.gitlab['signin_enabled'],
|
|
gravatar_enabled: Settings.gravatar['enabled'],
|
|
koding_enabled: false,
|
|
plantuml_enabled: false,
|
|
sign_in_text: nil,
|
|
after_sign_up_text: nil,
|
|
help_page_text: nil,
|
|
shared_runners_text: nil,
|
|
restricted_visibility_levels: Settings.gitlab['restricted_visibility_levels'],
|
|
max_attachment_size: Settings.gitlab['max_attachment_size'],
|
|
session_expire_delay: Settings.gitlab['session_expire_delay'],
|
|
default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'],
|
|
default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'],
|
|
domain_whitelist: Settings.gitlab['domain_whitelist'],
|
|
import_sources: %w[gitea github bitbucket gitlab google_code fogbugz git gitlab_project],
|
|
shared_runners_enabled: Settings.gitlab_ci['shared_runners_enabled'],
|
|
max_artifacts_size: Settings.artifacts['max_size'],
|
|
require_two_factor_authentication: false,
|
|
two_factor_grace_period: 48,
|
|
akismet_enabled: false,
|
|
repository_checks_enabled: true,
|
|
container_registry_token_expire_delay: 5,
|
|
user_default_external: false,
|
|
sidekiq_throttling_enabled: false,
|
|
)
|
|
end
|
|
|
|
private
|
|
|
|
def connect_to_db?
|
|
# When the DBMS is not available, an exception (e.g. PG::ConnectionBad) is raised
|
|
active_db_connection = ActiveRecord::Base.connection.active? rescue false
|
|
|
|
active_db_connection &&
|
|
ActiveRecord::Base.connection.table_exists?('application_settings')
|
|
rescue ActiveRecord::NoDatabaseError
|
|
false
|
|
end
|
|
end
|
|
end
|