Merge branch 'ee-bvl-reject-ee-namespace-names' into 'master'

Order rejected paths like in EE

See merge request !1821

app/validators/dynamic_path_validator.rb

@@ -115,22 +115,22 @@ class DynamicPathValidator < ActiveModel::EachValidator
   # this would map to the activity-page of it's parent.
   GROUP_ROUTES = %w[
     activity
+    analytics
+    audit_events
     avatar
     edit
     group_members
+    hooks
     issues
     labels
-    merge_requests
-    milestones
-    projects
-    subgroups
-    analytics
-    audit_events
-    hooks
     ldap
     ldap_group_links
+    merge_requests
+    milestones
     notification_setting
     pipeline_quota
+    projects
+    subgroups
   ].freeze
 
   CHILD_ROUTES = (WILDCARD_ROUTES | GROUP_ROUTES).freeze

db/post_migrate/20170412174900_rename_reserved_dynamic_paths.rb

@@ -36,18 +36,18 @@ class RenameReservedDynamicPaths < ActiveRecord::Migration
 
   DISSALLOWED_GROUP_PATHS = %w[
     activity
-    avatar
-    group_members
-    labels
-    milestones
-    subgroups
     analytics
     audit_events
+    avatar
+    group_members
     hooks
+    labels
     ldap
     ldap_group_links
+    milestones
     notification_setting
     pipeline_quota
+    subgroups
   ]
 
   def up