diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
commit | 3b1af5cc7ed2666ff18b718ce5d30fa5a2756674 (patch) | |
tree | 3bc4a40e0ee51ec27eabf917c537033c0c5b14d4 /app/controllers/organizations | |
parent | 9bba14be3f2c211bf79e15769cd9b77bc73a13bc (diff) |
Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42
Diffstat (limited to 'app/controllers/organizations')
-rw-r--r-- | app/controllers/organizations/application_controller.rb | 21 | ||||
-rw-r--r-- | app/controllers/organizations/organizations_controller.rb | 11 |
2 files changed, 32 insertions, 0 deletions
diff --git a/app/controllers/organizations/application_controller.rb b/app/controllers/organizations/application_controller.rb new file mode 100644 index 00000000000..5f5a57d176b --- /dev/null +++ b/app/controllers/organizations/application_controller.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +module Organizations + class ApplicationController < ::ApplicationController + before_action :organization + + private + + def organization + return unless params[:organization_path] + + @organization = Organizations::Organization.find_by_path(params[:organization_path]) + end + strong_memoize_attr :organization + + def authorize_action!(action) + access_denied! if Feature.disabled?(:ui_for_organizations) + access_denied! unless can?(current_user, action, organization) + end + end +end diff --git a/app/controllers/organizations/organizations_controller.rb b/app/controllers/organizations/organizations_controller.rb new file mode 100644 index 00000000000..0eb5c3aa6fd --- /dev/null +++ b/app/controllers/organizations/organizations_controller.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module Organizations + class OrganizationsController < ApplicationController + feature_category :cell + + before_action { authorize_action!(:admin_organization) } + + def directory; end + end +end |