diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-03 12:00:27 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-03 12:00:27 +0100 |
| commit | d23ffc832c465c873ad5a70117a57bf32f0b4735 (patch) | |
| tree | d9e01cf24d602261d661e214b3a33ff7f349d423 | |
| parent | 8a22b5bf544bd258b5cacca78b9f241849418d16 (diff) | |
| download | gitlab-ce-d23ffc832c465c873ad5a70117a57bf32f0b4735.tar.gz | |
Fix code that depends on incorrect inflector behavior
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/views/search/results/_commit.html.haml (renamed from app/views/search/results/_commits.html.haml) | 2 | ||||
| -rw-r--r-- | spec/mailers/notify_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/search/results/_commits.html.haml b/app/views/search/results/_commit.html.haml index 7cff694350f..4e6c3965dc6 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 cb67ec95d57..47863d54579 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}\)/ |