diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-01-04 10:35:14 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-01-04 10:35:14 +0000 |
| commit | 147f740730b63dbdd4c457bb3a783510d225d73b (patch) | |
| tree | dea56648f2a635a875527fb9c9c216c02a707d9c /app/models/project.rb | |
| parent | 43687c62607075ee201b8ea1e16ac6e6563b45be (diff) | |
| parent | ba861a22198255bb461596e7fe6ec88248d1a2fe (diff) | |
| download | gitlab-ce-147f740730b63dbdd4c457bb3a783510d225d73b.tar.gz | |
Merge branch 'sh-skip-validation-visibility-changed' into 'master'
Only validate project visibility when it has changed
Closes #55881
See merge request gitlab-org/gitlab-ce!24142
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 7a2bc8b78b3..58b10662ff0 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -330,8 +330,8 @@ class Project < ActiveRecord::Base validates :star_count, numericality: { greater_than_or_equal_to: 0 } validate :check_limit, on: :create validate :check_repository_path_availability, on: :update, if: ->(project) { project.renamed? } - validate :visibility_level_allowed_by_group - validate :visibility_level_allowed_as_fork + validate :visibility_level_allowed_by_group, if: -> { changes.has_key?(:visibility_level) } + validate :visibility_level_allowed_as_fork, if: -> { changes.has_key?(:visibility_level) } validate :check_wiki_path_conflict validate :validate_pages_https_only, if: -> { changes.has_key?(:pages_https_only) } validates :repository_storage, |