Merge branch 'master' into merge-conflicts-editor-2

4 files changed, 12 insertions, 2 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 83c3a42c19f..659ea51bc75 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -88,4 +88,6 @@ Rails.application.routes.draw do
   get ':username.keys' => 'profiles/keys#get_keys', constraints: { username: /.*/ }
 
   root to: "root#index"
+
+  get '*unmatched_route', to: 'application#not_found'
 end
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 47a8a0a53d4..06b464d79c8 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -1,8 +1,14 @@
 require 'constraints/group_url_constrainer'
 
 constraints(GroupUrlConstrainer.new) do
-  scope(path: ':id', as: :group, controller: :groups) do
+  scope(path: ':id',
+        as: :group,
+        constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ },
+        controller: :groups) do
     get '/', action: :show
+    patch '/', action: :update
+    put '/', action: :update
+    delete '/', action: :destroy
   end
 end
 
diff --git a/config/routes/project.rb b/config/routes/project.rb
index cbce9cd47a0..711a59df744 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -274,6 +274,7 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only:
           post :merge
           post :cancel_merge_when_build_succeeds
           get :ci_status
+          get :ci_environments_status
           post :toggle_subscription
           post :remove_wip
           get :diff_for_path
@@ -408,7 +409,7 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only:
         end
       end
 
-      resources :group_links, only: [:index, :create, :destroy], constraints: { id: /\d+/ }
+      resources :group_links, only: [:index, :create, :update, :destroy], constraints: { id: /\d+/ }
 
       resources :notes, only: [:index, :create, :destroy, :update], concerns: :awardable, constraints: { id: /\d+/ } do
         member do
diff --git a/config/routes/user.rb b/config/routes/user.rb
index 54bbcb18f6a..dfb5d2a2ba4 100644
--- a/config/routes/user.rb
+++ b/config/routes/user.rb
@@ -33,5 +33,6 @@ scope(path: 'u/:username',
   get :projects
   get :contributed, as: :contributed_projects
   get :snippets
+  get :exists
   get '/', to: redirect('/%{username}')
 end