Skip to content
Snippets Groups Projects

Unify Security Configuration between EE and CE

Merged Tetiana Chupryna requested to merge 339023-unify-configuration-ee-ce into master
All threads resolved!
2 files
+ 11
12
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -10,8 +10,6 @@ class ConfigurationController < Projects::ApplicationController
def show
render_403 unless can?(current_user, :read_security_configuration, project)
configuration
respond_to do |format|
format.html
format.json do
@@ -23,7 +21,7 @@ def show
private
def configuration
@configuration = if Feature.enabled?(:unify_security_configuration, project, default_enabled: :yaml)
@configuration = if unify_configuration_enabled?
configuration_presenter
else
{}
@@ -39,6 +37,10 @@ def configuration_presenter
def presenter_attributes
{ }
end
def unify_configuration_enabled?
Feature.enabled?(:unify_security_configuration, project, default_enabled: :yaml)
end
end
end
end
Loading