Resolve conflicts in config/routes/group.rb and lib/gitlab/path_regex.rb

config/routes/group.rb

@@ -8,14 +8,6 @@ constraints(GroupUrlConstrainer.new) do
   scope(path: 'groups/*id',
         controller: :groups,
         constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom)/ }) do
-<<<<<<< HEAD
-    get :edit, as: :edit_group
-    get :issues, as: :issues_group
-    get :merge_requests, as: :merge_requests_group
-    get :projects, as: :projects_group
-    get :activity, as: :activity_group
-    get :subgroups, as: :subgroups_group
-=======
     scope(path: '-') do
       get :edit, as: :edit_group
       get :issues, as: :issues_group
@@ -24,7 +16,6 @@ constraints(GroupUrlConstrainer.new) do
       get :activity, as: :activity_group
     end
 
->>>>>>> upstream/master
     get '/', action: :show, as: :group_canonical
   end
 
@@ -32,27 +23,6 @@ constraints(GroupUrlConstrainer.new) do
         module: :groups,
         as: :group,
         constraints: { group_id: Gitlab::PathRegex.full_namespace_route_regex }) do
-<<<<<<< HEAD
-
-    ## EE-specific
-    resource :analytics, only: [:show]
-    resource :ldap, only: [] do
-      member do
-        put :sync
-      end
-    end
-
-    resources :ldap_group_links, only: [:index, :create, :destroy]
-    ## EE-specific
-
-    resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
-      post :resend_invite, on: :member
-      delete :leave, on: :collection
-
-      ## EE-specific
-      patch :override, on: :member
-      ## EE-specific
-=======
     namespace :settings do
       resource :ci_cd, only: [:show], controller: 'ci_cd'
     end
@@ -63,7 +33,6 @@ constraints(GroupUrlConstrainer.new) do
 
     resources :labels, except: [:show] do
       post :toggle_subscription, on: :member
->>>>>>> upstream/master
     end
 
     resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :edit, :update, :new, :create] do
@@ -74,60 +43,12 @@ constraints(GroupUrlConstrainer.new) do
       end
     end
 
-<<<<<<< HEAD
-    ## EE-specific
-    resource :notification_setting, only: [:update]
-    resources :audit_events, only: [:index]
-    resources :pipeline_quota, only: [:index]
-    ## EE-specific
-
-    ## EE-specific
-    resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ } do
-      member do
-        get :test
-      end
-    end
-    ## EE-specific
-
-    resources :labels, except: [:show] do
-      post :toggle_subscription, on: :member
-    end
-
-    scope path: '-' do
-      namespace :settings do
-        resource :ci_cd, only: [:show], controller: 'ci_cd'
-      end
-
-      resources :variables, only: [:index, :show, :update, :create, :destroy]
-
-      resources :children, only: [:index]
-
-      ## EE-specific
-      resources :billings, only: [:index]
-      resources :boards, only: [:index, :show, :create, :update, :destroy]
-      resources :epics do
-        member do
-          get :realtime_changes
-        end
-      end
-    end
-
-    ## EE-specific
-    legacy_ee_group_boards_redirect = redirect do |params, request|
-      path = "/groups/#{params[:group_id]}/-/boards"
-      path << "/#{params[:extra_params]}" if params[:extra_params].present?
-      path << "?#{request.query_string}" if request.query_string.present?
-      path
-=======
     resource :avatar, only: [:destroy]
 
     resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
       post :resend_invite, on: :member
       delete :leave, on: :collection
->>>>>>> upstream/master
     end
-
-    get 'boards(/*extra_params)', as: :legacy_ee_group_boards_redirect, to: legacy_ee_group_boards_redirect
   end
 
   scope(path: '*id',

lib/gitlab/path_regex.rb

@@ -114,26 +114,6 @@ module Gitlab
     # this would map to the activity-page of its parent.
     GROUP_ROUTES = %w[
       -
-<<<<<<< HEAD
-      activity
-      analytics
-      audit_events
-      avatar
-      edit
-      group_members
-      hooks
-      issues
-      labels
-      ldap
-      ldap_group_links
-      merge_requests
-      milestones
-      notification_setting
-      pipeline_quota
-      projects
-      subgroups
-=======
->>>>>>> upstream/master
     ].freeze
 
     ILLEGAL_PROJECT_PATH_WORDS = PROJECT_WILDCARD_ROUTES