diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-05-08 21:56:37 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-05-11 14:52:47 +0200 |
| commit | d922f54548ee64ff8cffb7234f574333d4edd2b7 (patch) | |
| tree | 655611d1172faf7dc1da90d49b5e88e51414b2e7 /app/models | |
| parent | 3eb8435fec3cd7311544a256a3205f31d1dc3a0c (diff) | |
| download | gitlab-ce-d922f54548ee64ff8cffb7234f574333d4edd2b7.tar.gz | |
Remove rails dependent: :destroy statement
Enforced by the database, and no callbacks need to be called.
Combined with 7b9b2c6099 and 294a8b8a6d this resolves
gitlab-org/gitlab-ce#31799
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index be4960aef8a..65745fd6d37 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -175,7 +175,7 @@ class Project < ActiveRecord::Base has_many :builds, class_name: 'Ci::Build' # the builds are created from the commit_statuses has_many :runner_projects, dependent: :destroy, class_name: 'Ci::RunnerProject' has_many :runners, through: :runner_projects, source: :runner, class_name: 'Ci::Runner' - has_many :variables, dependent: :destroy, class_name: 'Ci::Variable' + has_many :variables, class_name: 'Ci::Variable' has_many :triggers, dependent: :destroy, class_name: 'Ci::Trigger' has_many :environments, dependent: :destroy has_many :deployments, dependent: :destroy |