diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-11-15 15:30:05 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-11-16 13:08:08 -0500 |
commit | c8e53d4467e1e8cce4db04aafba00d55f014e283 (patch) | |
tree | 16d79078bfa633c4fa2e9dd7c181aa6f84ce0490 /app/controllers/projects/notes_controller.rb | |
parent | 43d5eca084112dc29df5ca1a521f95acaf3c9ccb (diff) | |
download | gitlab-ce-c8e53d4467e1e8cce4db04aafba00d55f014e283.tar.gz |
Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"rs-revert-gh-9820
This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing
changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a.
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
-rw-r--r-- | app/controllers/projects/notes_controller.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 0c98e2f1bfd..41cd08c93c6 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -3,7 +3,7 @@ class Projects::NotesController < Projects::ApplicationController before_action :authorize_read_note! before_action :authorize_create_note!, only: [:create] before_action :authorize_admin_note!, only: [:update, :destroy] - before_action :find_current_user_notes, except: [:destroy, :edit, :delete_attachment] + before_action :find_current_user_notes, except: [:destroy, :delete_attachment] def index current_fetched_at = Time.now.to_i @@ -29,11 +29,6 @@ class Projects::NotesController < Projects::ApplicationController end end - def edit - @note = note - render layout: false - end - def update @note = Notes::UpdateService.new(project, current_user, note_params).execute(note) |