diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-11-06 08:29:54 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-11-06 08:29:54 +0000 |
commit | 823a9d351b49a6be8c12cfe06edb4aa6ec08fe95 (patch) | |
tree | 4b831cd9e06c958d2aba5d8f7dece857066187fa | |
parent | ff996108a7c574080a2241ea0cfc4f4b3372cf35 (diff) | |
parent | c1f064cbe39d6008206a0fe31e10f4a5e0c9ad28 (diff) | |
download | gitlab-ce-823a9d351b49a6be8c12cfe06edb4aa6ec08fe95.tar.gz |
Merge branch 'fix/sm/37299-environments-validate-uniqueness-on-url-and-can-cause-silent-deployment-failures' into 'master'
Remove unique validation from external_url in Environment
Closes #37299
See merge request gitlab-org/gitlab-ce!15202
-rw-r--r-- | app/models/environment.rb | 1 | ||||
-rw-r--r-- | spec/models/environment_spec.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/app/models/environment.rb b/app/models/environment.rb index 8d6b0a32c13..21a028e351c 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -30,7 +30,6 @@ class Environment < ActiveRecord::Base message: Gitlab::Regex.environment_slug_regex_message } validates :external_url, - uniqueness: { scope: :project_id }, length: { maximum: 255 }, allow_nil: true, addressable_url: true diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb index f75de0a0d88..1ce1d595c60 100644 --- a/spec/models/environment_spec.rb +++ b/spec/models/environment_spec.rb @@ -18,7 +18,6 @@ describe Environment do it { is_expected.to validate_length_of(:slug).is_at_most(24) } it { is_expected.to validate_length_of(:external_url).is_at_most(255) } - it { is_expected.to validate_uniqueness_of(:external_url).scoped_to(:project_id) } describe '.order_by_last_deployed_at' do let(:project) { create(:project, :repository) } |