Merge branch…

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

Merge branch…
823a9d35 · Kamil Trzciński · ff996108 · c1f064cb · 823a9d35 · 823a9d35
Commit 823a9d35 authored Nov 06, 2017 by Kamil Trzciński
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

environment.rb app/models/environment.rb +0 -1

environment_spec.rb spec/models/environment_spec.rb +0 -1

No files found.
--- 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

--- 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) }