diff options
| author | Felipe Artur <felipefac@gmail.com> | 2017-09-12 18:07:11 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-09-12 18:10:34 -0300 |
| commit | 056c42cca5aa21fb2ebc9e5fc2cbedf18cf8dbbc (patch) | |
| tree | 48d9c42e8f56d1588be49d787f9b99aa43ff23c3 /app/models/project.rb | |
| parent | de14e9c20392c4edfb9ee05f8a3364d7510a4f99 (diff) | |
| download | gitlab-ce-056c42cca5aa21fb2ebc9e5fc2cbedf18cf8dbbc.tar.gz | |
Fix project feature being deleted when updating project with invalid visibility level
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 ff5638dd155..c422819a082 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -161,7 +161,7 @@ class Project < ActiveRecord::Base has_many :notification_settings, as: :source, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent has_one :import_data, class_name: 'ProjectImportData', inverse_of: :project, autosave: true - has_one :project_feature + has_one :project_feature, inverse_of: :project has_one :statistics, class_name: 'ProjectStatistics' # Container repositories need to remove data from the container registry, @@ -190,7 +190,7 @@ class Project < ActiveRecord::Base has_one :auto_devops, class_name: 'ProjectAutoDevops' accepts_nested_attributes_for :variables, allow_destroy: true - accepts_nested_attributes_for :project_feature + accepts_nested_attributes_for :project_feature, update_only: true accepts_nested_attributes_for :import_data accepts_nested_attributes_for :auto_devops |