diff options
author | Douwe Maan <douwe@selenight.nl> | 2016-05-20 16:23:04 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2016-05-20 16:23:04 -0500 |
commit | fc1910ddc5db25e608921f69c3dc28d830e6ea03 (patch) | |
tree | 1f82bd43de18fdb6ec1d01801d7d75c08bdf7928 /spec/services/system_note_service_spec.rb | |
parent | 63f53730c0483b4c9e6fa9d90413d40a8c74a243 (diff) | |
parent | 5341b16fc92425d557a1c62d0329b276170eba73 (diff) | |
download | gitlab-ce-fc1910ddc5db25e608921f69c3dc28d830e6ea03.tar.gz |
Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'
# Conflicts:
# app/services/system_note_service.rb
Diffstat (limited to 'spec/services/system_note_service_spec.rb')
-rw-r--r-- | spec/services/system_note_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index bffad59b8b6..ee976eb2926 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -241,7 +241,7 @@ describe SystemNoteService, services: true do it 'sets the note text' do expect(subject.note). - to eq "Title changed from **Old title** to **#{noteable.title}**" + to eq "Changed title: **{-Old title-}** → **{+#{noteable.title}+}**" end end end |