Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/app/models/organizations/organization_setting.rb b/app/models/organizations/organization_setting.rb
index 108531e6701..fb141c164d3 100644
--- a/app/models/organizations/organization_setting.rb
+++ b/app/models/organizations/organization_setting.rb
@@ -2,6 +2,8 @@
 
 module Organizations
   class OrganizationSetting < ApplicationRecord
+    extend ::Organization::CurrentOrganization
+
     belongs_to :organization
 
     validates :settings, json_schema: { filename: "organization_settings" }
@@ -16,5 +18,11 @@ module Organizations
         end
       end
     end
+
+    def self.for_current_organization
+      return unless current_organization
+
+      current_organization.settings || current_organization.build_settings
+    end
   end
 end