diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-06 07:48:09 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-06 07:48:09 +0000 |
| commit | 17feb2faa71416b3459003eeb2a877f2c65dd3ef (patch) | |
| tree | 2e69ac4758ec4e04e67c9c040fd8c398ab084939 | |
| parent | 6251df6d6a1862562ce4c5fa28f432bf9662e3c3 (diff) | |
| parent | a048e4a4717f71ecf1a1780d55639b029be5d71e (diff) | |
| download | gitlab-ce-17feb2faa71416b3459003eeb2a877f2c65dd3ef.tar.gz | |
Merge branch 'issue-23254' into 'master'
Cleanup style of confirmation page
See merge request !11774
| -rw-r--r-- | app/views/sent_notifications/unsubscribe.html.haml | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/issue-23254.yml | 4 | ||||
| -rw-r--r-- | spec/features/unsubscribe_links_spec.rb | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/app/views/sent_notifications/unsubscribe.html.haml b/app/views/sent_notifications/unsubscribe.html.haml index 9ce6a1aeef5..de52fd00157 100644 --- a/app/views/sent_notifications/unsubscribe.html.haml +++ b/app/views/sent_notifications/unsubscribe.html.haml @@ -1,16 +1,14 @@ - noteable = @sent_notification.noteable -- noteable_type = @sent_notification.noteable_type.humanize(capitalize: false) +- noteable_type = @sent_notification.noteable_type.titleize.downcase - noteable_text = %(#{noteable.title} (#{noteable.to_reference})) - -- page_title "Unsubscribe", noteable_text, @sent_notification.noteable_type.humanize.pluralize, @sent_notification.project.name_with_namespace - +- page_title "Unsubscribe", noteable_text, noteable_type.pluralize, @sent_notification.project.name_with_namespace %h3.page-title - Unsubscribe from #{noteable_type} #{noteable_text} + Unsubscribe from #{noteable_type} %p = succeed '?' do - Are you sure you want to unsubscribe from #{noteable_type} + Are you sure you want to unsubscribe from the #{noteable_type}: = link_to noteable_text, url_for([@sent_notification.project.namespace.becomes(Namespace), @sent_notification.project, noteable]) %p diff --git a/changelogs/unreleased/issue-23254.yml b/changelogs/unreleased/issue-23254.yml new file mode 100644 index 00000000000..568a7a41c30 --- /dev/null +++ b/changelogs/unreleased/issue-23254.yml @@ -0,0 +1,4 @@ +--- +title: Fixed style on unsubscribe page +merge_request: +author: Gustav Ernberg diff --git a/spec/features/unsubscribe_links_spec.rb b/spec/features/unsubscribe_links_spec.rb index a23c4ca2b92..8509551ce4a 100644 --- a/spec/features/unsubscribe_links_spec.rb +++ b/spec/features/unsubscribe_links_spec.rb @@ -24,8 +24,8 @@ describe 'Unsubscribe links', feature: true do visit body_link expect(current_path).to eq unsubscribe_sent_notification_path(SentNotification.last) - expect(page).to have_text(%(Unsubscribe from issue #{issue.title} (#{issue.to_reference}))) - expect(page).to have_text(%(Are you sure you want to unsubscribe from issue #{issue.title} (#{issue.to_reference})?)) + expect(page).to have_text(%(Unsubscribe from issue)) + expect(page).to have_text(%(Are you sure you want to unsubscribe from the issue: #{issue.title} (#{issue.to_reference})?)) expect(issue.subscribed?(recipient, project)).to be_truthy click_link 'Unsubscribe' |