diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-13 17:14:46 -0500 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-13 17:14:46 -0500 |
| commit | 0958f331d1af67514c80f0bc582c93b0ae1ed491 (patch) | |
| tree | 512f37d66e349b1b9e6420cf7739aea7ee1ac324 /spec/models/project_services/slack_service/note_message_spec.rb | |
| parent | 509654b3784da2a084a0c8303e9c6cc1498b8d2b (diff) | |
| parent | d7a28f3c12950d56a187148fda9dce39a9f2bf08 (diff) | |
| download | gitlab-ce-0958f331d1af67514c80f0bc582c93b0ae1ed491.tar.gz | |
Merge remote-tracking branch 'origin/master' into docker-registry
# Conflicts:
# config/initializers/1_settings.rb
Diffstat (limited to 'spec/models/project_services/slack_service/note_message_spec.rb')
| -rw-r--r-- | spec/models/project_services/slack_service/note_message_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/project_services/slack_service/note_message_spec.rb b/spec/models/project_services/slack_service/note_message_spec.rb index d37590cab75..379c3e1219c 100644 --- a/spec/models/project_services/slack_service/note_message_spec.rb +++ b/spec/models/project_services/slack_service/note_message_spec.rb @@ -65,7 +65,7 @@ describe SlackService::NoteMessage, models: true do expect(message.pretext).to eq("Test User commented on " \ "<url|merge request !30> in <somewhere.com|project_name>: " \ "*merge request title*") - expected_attachments = [ + expected_attachments = [ { text: "comment on a merge request", color: color, @@ -117,7 +117,7 @@ describe SlackService::NoteMessage, models: true do expect(message.pretext).to eq("Test User commented on " \ "<url|snippet #5> in <somewhere.com|project_name>: " \ "*snippet title*") - expected_attachments = [ + expected_attachments = [ { text: "comment on a snippet", color: color, |