diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-20 12:42:31 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-20 12:42:31 +0000 |
| commit | a4006a6b4840c990adf5293d7c611b2fa798a5bf (patch) | |
| tree | 4c4df25558f8b35880adb2cf538e92d594d154e0 /app/controllers | |
| parent | d9f7499046f25dcbe69c50cb819315e69c0bf213 (diff) | |
| parent | 630e879066156e8593a8b42b531ef727227c60bf (diff) | |
| download | gitlab-ce-a4006a6b4840c990adf5293d7c611b2fa798a5bf.tar.gz | |
Merge branch 'better-commit-mentions' into 'master'
Clean up code around commit mentions.
Builds upon !527.
See merge request !528
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 87e39f1363a..894cf93b9ae 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -10,11 +10,11 @@ class Projects::CommitController < Projects::ApplicationController def show return git_not_found! unless @commit - @line_notes = @project.notes.for_commit_id(commit.id).inline + @line_notes = commit.notes(@project).inline @diffs = @commit.diffs @note = @project.build_commit_note(commit) - @notes_count = @project.notes.for_commit_id(commit.id).count - @notes = @project.notes.for_commit_id(@commit.id).not_inline.fresh + @notes_count = commit.notes(@project).count + @notes = commit.notes(@project).not_inline.fresh @noteable = @commit @comments_allowed = @reply_allowed = true @comments_target = { |