diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-05-20 00:12:53 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-05-20 00:12:53 +0300 |
| commit | 18ef054bc7eb14a7b817af5f66f140f2f3dd4ae6 (patch) | |
| tree | eae7f19fb7c8f6b5009546ef3224e2558bd26560 /spec/lib | |
| parent | c50e7b1202f8a8534719ae266a53893e1ab3a2fa (diff) | |
| parent | a9977f2b7a39d57d0633714616b4653aca103993 (diff) | |
Merge branch '17464-backport-email-syntax-highlighting' into 'master'
Syntax-highlight diffs in push emails
Based on:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
See merge request !4147
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/email/message/repository_push_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/email/message/repository_push_spec.rb b/spec/lib/gitlab/email/message/repository_push_spec.rb index 7d6cce6daec..c19f33e2224 100644 --- a/spec/lib/gitlab/email/message/repository_push_spec.rb +++ b/spec/lib/gitlab/email/message/repository_push_spec.rb @@ -57,7 +57,7 @@ describe Gitlab::Email::Message::RepositoryPush do describe '#diffs' do subject { message.diffs } - it { is_expected.to all(be_an_instance_of Gitlab::Git::Diff) } + it { is_expected.to all(be_an_instance_of Gitlab::Diff::File) } end describe '#diffs_count' do |