diff --git a/app/views/search/results/_commits.html.haml b/app/views/search/results/_commit.html.haml similarity index 90% rename from app/views/search/results/_commits.html.haml rename to app/views/search/results/_commit.html.haml index 7cff694350ffbac05c33db26cde43f6fba879325..4e6c3965dc65dac0a96f427c8466b2091df7b37e 100644 --- a/app/views/search/results/_commits.html.haml +++ b/app/views/search/results/_commit.html.haml @@ -1,2 +1,2 @@ .search-result-row - = render 'projects/commits/commit', project: @project, commit: commits + = render 'projects/commits/commit', project: @project, commit: commit diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index cb67ec95d57469d11f09eb9b7b28422a66c3cfe7..47863d54579e05959f2c5930d89bf2352d8f695e 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -468,7 +468,7 @@ describe Notify do subject { Notify.note_commit_email(recipient.id, note.id) } it_behaves_like 'a note email' - it_behaves_like 'an answer to an existing thread', 'commits' + it_behaves_like 'an answer to an existing thread', 'commit' it 'has the correct subject' do is_expected.to have_subject /#{commit.title} \(#{commit.short_id}\)/