diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-06-21 17:30:12 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-06-21 17:30:12 +0000 |
| commit | d9ad56f3c5a7fc5e682ec96731b0578719934122 (patch) | |
| tree | a89935f89800564ccf457e389f44758c75ba5382 /app/models/ci/variable.rb | |
| parent | 3f11829fe09cabd94df8879673f1d15f49ee9b9f (diff) | |
| download | gitlab-ce-d9ad56f3c5a7fc5e682ec96731b0578719934122.tar.gz | |
Add environment_scope column to ci_variables table
This is merely to make CE and EE more compatible.
See the EE merge request at:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
Diffstat (limited to 'app/models/ci/variable.rb')
| -rw-r--r-- | app/models/ci/variable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/variable.rb b/app/models/ci/variable.rb index f235260208f..67444118ec5 100644 --- a/app/models/ci/variable.rb +++ b/app/models/ci/variable.rb @@ -6,7 +6,7 @@ module Ci validates :key, presence: true, - uniqueness: { scope: :project_id }, + uniqueness: { scope: [:project_id, :environment_scope] }, length: { maximum: 255 }, format: { with: /\A[a-zA-Z0-9_]+\z/, message: "can contain only letters, digits and '_'." } |