Merge branch 'rs-revert-gh-9820' into 'master'

Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"

This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing
changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a.

Reverts https://github.com/gitlabhq/gitlabhq/pull/9820

See merge request !1804

1 files changed, 1 insertions, 1 deletions

diff --git a/config/routes.rb b/config/routes.rb
index c0077ab1a99..0bc2c173453 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -660,7 +660,7 @@ Gitlab::Application.routes.draw do
           end
         end
 
-        resources :notes, constraints: { id: /\d+/ } do
+        resources :notes, only: [:index, :create, :destroy, :update], constraints: { id: /\d+/ } do
           member do
             delete :delete_attachment
           end