Merge branch 'master' into 6-0-dev

Conflicts:
	app/views/dashboard/projects.html.haml
	app/views/layouts/_head_panel.html.haml
	config/routes.rb

2 files changed, 7 insertions, 2 deletions

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 9f50aab3c28..ad24ba97c6f 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -18,6 +18,7 @@ production: &base
     host: localhost
     port: 80
     https: false
+    # WARNING: This feature is no longer supported
     # Uncomment and customize to run in non-root path
     # Note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/puma.rb may need to be changed
     # relative_url_root: /gitlab
diff --git a/config/routes.rb b/config/routes.rb
index 4e0c010840f..f319ef221df 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -284,12 +284,16 @@ Gitlab::Application.routes.draw do
         end
       end
 
-      resources :notes, only: [:index, :create, :destroy] do
+      resources :notes, only: [:index, :create, :destroy, :update] do
+        member do
+          delete :delete_attachment
+        end
+
         collection do
           post :preview
         end
       end
-      end
+    end
   end
 
   root to: "dashboard#show"