diff options
| author | Felipe Artur <felipefac@gmail.com> | 2018-02-02 20:49:23 +0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2018-02-02 20:49:23 +0300 |
| commit | 80714a5eeb3d80295cbc109c6b48eb91163ef97c (patch) | |
| tree | be1e89c46ebfa67d3f2740210bb33feba39df8f3 /app/controllers/projects | |
| parent | 7ccbed4216fa6089f0495e9f7bac8f975af724ef (diff) | |
| parent | 476d3b1aab5c909eacd938f735e59cbbb06dffa7 (diff) | |
Merge branch 'acet-mr-notes-index' of gitlab.com:gitlab-org/gitlab-ce into acet-mr-notes-index
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index e43c5de51dc..e68d5b011a6 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -1,5 +1,6 @@ class Projects::NotesController < Projects::ApplicationController include NotesActions + include NotesHelper include ToggleAwardEmoji before_action :authorize_read_note! |