1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/ci/group_variable.rb b/app/models/ci/group_variable.rb
index 1e1dd68ee6c..2928ce801ad 100644
--- a/app/models/ci/group_variable.rb
+++ b/app/models/ci/group_variable.rb
@@ -6,16 +6,18 @@ module Ci
     include Ci::HasVariable
     include Presentable
     include Ci::Maskable
+    prepend HasEnvironmentScope
 
     belongs_to :group, class_name: "::Group"
 
     alias_attribute :secret_value, :value
 
     validates :key, uniqueness: {
-      scope: :group_id,
+      scope: [:group_id, :environment_scope],
       message: "(%{value}) has already been taken"
     }
 
     scope :unprotected, -> { where(protected: false) }
+    scope :by_environment_scope, -> (environment_scope) { where(environment_scope: environment_scope) }
   end
 end