Commit 56b80a54 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Order rejected paths like in EE

To avoid merge conflicts
parent 5c29411e
...@@ -115,22 +115,22 @@ class DynamicPathValidator < ActiveModel::EachValidator ...@@ -115,22 +115,22 @@ class DynamicPathValidator < ActiveModel::EachValidator
# this would map to the activity-page of it's parent. # this would map to the activity-page of it's parent.
GROUP_ROUTES = %w[ GROUP_ROUTES = %w[
activity activity
analytics
audit_events
avatar avatar
edit edit
group_members group_members
hooks
issues issues
labels labels
merge_requests
milestones
projects
subgroups
analytics
audit_events
hooks
ldap ldap
ldap_group_links ldap_group_links
merge_requests
milestones
notification_setting notification_setting
pipeline_quota pipeline_quota
projects
subgroups
].freeze ].freeze
CHILD_ROUTES = (WILDCARD_ROUTES | GROUP_ROUTES).freeze CHILD_ROUTES = (WILDCARD_ROUTES | GROUP_ROUTES).freeze
......
...@@ -36,18 +36,18 @@ class RenameReservedDynamicPaths < ActiveRecord::Migration ...@@ -36,18 +36,18 @@ class RenameReservedDynamicPaths < ActiveRecord::Migration
DISSALLOWED_GROUP_PATHS = %w[ DISSALLOWED_GROUP_PATHS = %w[
activity activity
avatar
group_members
labels
milestones
subgroups
analytics analytics
audit_events audit_events
avatar
group_members
hooks hooks
labels
ldap ldap
ldap_group_links ldap_group_links
milestones
notification_setting notification_setting
pipeline_quota pipeline_quota
subgroups
] ]
def up def up
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment