Add latest changes from gitlab-org/gitlab@master

1 files changed, 25 insertions, 4 deletions

diff --git a/app/models/concerns/limitable.rb b/app/models/concerns/limitable.rb
index f320f54bb82..3cb0bd85936 100644
--- a/app/models/concerns/limitable.rb
+++ b/app/models/concerns/limitable.rb
@@ -2,6 +2,7 @@
 
 module Limitable
   extend ActiveSupport::Concern
+  GLOBAL_SCOPE = :limitable_global_scope
 
   included do
     class_attribute :limit_scope
@@ -14,14 +15,34 @@ module Limitable
   private
 
   def validate_plan_limit_not_exceeded
+    if GLOBAL_SCOPE == limit_scope
+      validate_global_plan_limit_not_exceeded
+    else
+      validate_scoped_plan_limit_not_exceeded
+    end
+  end
+
+  def validate_scoped_plan_limit_not_exceeded
     scope_relation = self.public_send(limit_scope) # rubocop:disable GitlabSecurity/PublicSend
     return unless scope_relation
 
     relation = self.class.where(limit_scope => scope_relation)
+    limits = scope_relation.actual_limits
 
-    if scope_relation.actual_limits.exceeded?(limit_name, relation)
-      errors.add(:base, _("Maximum number of %{name} (%{count}) exceeded") %
-        { name: limit_name.humanize(capitalize: false), count: scope_relation.actual_limits.public_send(limit_name) }) # rubocop:disable GitlabSecurity/PublicSend
-    end
+    check_plan_limit_not_exceeded(limits, relation)
+  end
+
+  def validate_global_plan_limit_not_exceeded
+    relation = self.class.all
+    limits = Plan.default.actual_limits
+
+    check_plan_limit_not_exceeded(limits, relation)
+  end
+
+  def check_plan_limit_not_exceeded(limits, relation)
+    return unless limits.exceeded?(limit_name, relation)
+
+    errors.add(:base, _("Maximum number of %{name} (%{count}) exceeded") %
+        { name: limit_name.humanize(capitalize: false), count: limits.public_send(limit_name) }) # rubocop:disable GitlabSecurity/PublicSend
   end
 end