Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 2 deletions

diff --git a/app/models/ci/group_variable.rb b/app/models/ci/group_variable.rb
index 508aaa5a63c..b03c46a164f 100644
--- a/app/models/ci/group_variable.rb
+++ b/app/models/ci/group_variable.rb
@@ -3,9 +3,11 @@
 module Ci
   class GroupVariable < Ci::ApplicationRecord
     include Ci::HasVariable
-    include Presentable
     include Ci::Maskable
     include Ci::RawVariable
+    include Limitable
+    include Presentable
+
     prepend HasEnvironmentScope
 
     belongs_to :group, class_name: "::Group"
@@ -21,6 +23,9 @@ module Ci
     scope :by_environment_scope, -> (environment_scope) { where(environment_scope: environment_scope) }
     scope :for_groups, ->(group_ids) { where(group_id: group_ids) }
 
+    self.limit_name = 'group_ci_variables'
+    self.limit_scope = :group
+
     def audit_details
       key
     end
diff --git a/app/models/ci/variable.rb b/app/models/ci/variable.rb
index f4e17b5d812..23fe89c38df 100644
--- a/app/models/ci/variable.rb
+++ b/app/models/ci/variable.rb
@@ -3,9 +3,11 @@
 module Ci
   class Variable < Ci::ApplicationRecord
     include Ci::HasVariable
-    include Presentable
     include Ci::Maskable
     include Ci::RawVariable
+    include Limitable
+    include Presentable
+
     prepend HasEnvironmentScope
 
     belongs_to :project
@@ -20,6 +22,9 @@ module Ci
     scope :unprotected, -> { where(protected: false) }
     scope :by_environment_scope, -> (environment_scope) { where(environment_scope: environment_scope) }
 
+    self.limit_name = 'project_ci_variables'
+    self.limit_scope = :project
+
     def audit_details
       key
     end