diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-07-25 06:21:55 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-07-26 16:53:39 -0700 |
| commit | 871723da7fa6b341b64197e27c6bd99d52f2dcd8 (patch) | |
| tree | ca49827a4c589d8402a380276d4ae6ca5bc916ce /app/controllers | |
| parent | d1ea2bca61dff21948024d897e1d4475123a10e8 (diff) | |
| download | gitlab-ce-871723da7fa6b341b64197e27c6bd99d52f2dcd8.tar.gz | |
Incorporate review comments
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 16ed7c2b6b4..91ff9407216 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -71,7 +71,7 @@ class Projects::IssuesController < Projects::ApplicationController @note = @project.notes.new(noteable: @issue) @noteable = @issue - preload_max_access_for_authors(@notes, @project) if @notes + preload_max_access_for_authors(@notes, @project) respond_to do |format| format.html diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index da1b9c3e48a..23252fa59cc 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -387,7 +387,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController @ref ) - preload_max_access_for_authors(@notes, @project) if @notes + preload_max_access_for_authors(@notes, @project) end def define_widget_vars |