summaryrefslogtreecommitdiff
path: root/app/models/route.rb
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-05-05 10:48:01 -0700
committerMichael Kozono <mkozono@gmail.com>2017-05-05 12:12:51 -0700
commite1c245af51e294c84552cff8021342e7ae493b8a (patch)
treee09f11c25d7b232bfdb08ccaaaa4f76b6d20b4bf /app/models/route.rb
parentf05469f99b8c52c4dab7ac9160b47676c87124f9 (diff)
downloadgitlab-ce-e1c245af51e294c84552cff8021342e7ae493b8a.tar.gz
Resolve discussions
Diffstat (limited to 'app/models/route.rb')
-rw-r--r--app/models/route.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/route.rb b/app/models/route.rb
index 3d798ce937b..b34cce9077a 100644
--- a/app/models/route.rb
+++ b/app/models/route.rb
@@ -16,7 +16,7 @@ class Route < ActiveRecord::Base
scope :direct_descendant_routes, -> (path) { where('routes.path LIKE ? AND routes.path NOT LIKE ?', "#{sanitize_sql_like(path)}/%", "#{sanitize_sql_like(path)}/%/%") }
def rename_direct_descendant_routes
- return if !path_changed? && !name_changed?
+ return unless path_changed? || name_changed?
direct_descendant_routes = self.class.direct_descendant_routes(path_was)