Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a048e4a4
Commit
a048e4a4
authored
May 29, 2017
by
Gustav Ernberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed style on unsubscribe page
Removed unnecassary logic Added missing 'the' Fix case Fixed specs
parent
3ad3f906
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
app/views/sent_notifications/unsubscribe.html.haml
app/views/sent_notifications/unsubscribe.html.haml
+4
-6
changelogs/unreleased/issue-23254.yml
changelogs/unreleased/issue-23254.yml
+4
-0
spec/features/unsubscribe_links_spec.rb
spec/features/unsubscribe_links_spec.rb
+2
-2
No files found.
app/views/sent_notifications/unsubscribe.html.haml
View file @
a048e4a4
-
noteable
=
@sent_notification
.
noteable
-
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}))
-
noteable_text
=
%(#{noteable.title} (#{noteable.to_reference}))
-
page_title
"Unsubscribe"
,
noteable_text
,
noteable_type
.
pluralize
,
@sent_notification
.
project
.
name_with_namespace
-
page_title
"Unsubscribe"
,
noteable_text
,
@sent_notification
.
noteable_type
.
humanize
.
pluralize
,
@sent_notification
.
project
.
name_with_namespace
%h3
.page-title
%h3
.page-title
Unsubscribe from
#{
noteable_type
}
#{
noteable_text
}
Unsubscribe from
#{
noteable_type
}
%p
%p
=
succeed
'?'
do
=
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
])
=
link_to
noteable_text
,
url_for
([
@sent_notification
.
project
.
namespace
.
becomes
(
Namespace
),
@sent_notification
.
project
,
noteable
])
%p
%p
...
...
changelogs/unreleased/issue-23254.yml
0 → 100644
View file @
a048e4a4
---
title
:
Fixed style on unsubscribe page
merge_request
:
author
:
Gustav Ernberg
spec/features/unsubscribe_links_spec.rb
View file @
a048e4a4
...
@@ -24,8 +24,8 @@ describe 'Unsubscribe links', feature: true do
...
@@ -24,8 +24,8 @@ describe 'Unsubscribe links', feature: true do
visit
body_link
visit
body_link
expect
(
current_path
).
to
eq
unsubscribe_sent_notification_path
(
SentNotification
.
last
)
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
(
%(Unsubscribe from issue)
)
expect
(
page
).
to
have_text
(
%(Are you sure you want to unsubscribe from
issue
#{issue.title} (#{issue.to_reference})?)
)
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
expect
(
issue
.
subscribed?
(
recipient
,
project
)).
to
be_truthy
click_link
'Unsubscribe'
click_link
'Unsubscribe'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment