diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-11 10:42:59 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-11 10:42:59 +0000 |
| commit | 8d74966fe8d06964514ba3f701928c617801ff9f (patch) | |
| tree | a95ef9169cae5362ef02afe0044b0ec57133d055 | |
| parent | ab39a655e2aafda0416d123333dc4f005f58ac23 (diff) | |
| parent | c3e40ed8ff0b2d0d9260667ec7825453af0bd6f3 (diff) | |
| download | gitlab-ce-8d74966fe8d06964514ba3f701928c617801ff9f.tar.gz | |
Merge branch 'blackst0ne-rails5-fix-route-source-can-t-be-blank' into 'master'
Resolve "[Rails5] Fix `Route source can't be blank`"
Closes #46228
See merge request gitlab-org/gitlab-ce!18890
| -rw-r--r-- | app/models/concerns/routable.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/concerns/routable.rb b/app/models/concerns/routable.rb index 915ad6959be..0176a12a131 100644 --- a/app/models/concerns/routable.rb +++ b/app/models/concerns/routable.rb @@ -4,7 +4,9 @@ module Routable extend ActiveSupport::Concern included do - has_one :route, as: :source, autosave: true, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent + # Remove `inverse_of: source` when upgraded to rails 5.2 + # See https://github.com/rails/rails/pull/28808 + has_one :route, as: :source, autosave: true, dependent: :destroy, inverse_of: :source # rubocop:disable Cop/ActiveRecordDependent has_many :redirect_routes, as: :source, autosave: true, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent validates :route, presence: true |