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
977e30c8
Commit
977e30c8
authored
2 years ago
by
Peter Hegman
Committed by
Paul Slaughter
2 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate checkboxes on user notifications page to be Pajamas compliant
Part of Pajamas migration day Changelog: changed
parent
537afcc7
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
app/views/profiles/notifications/_email_settings.html.haml
app/views/profiles/notifications/_email_settings.html.haml
+1
-3
app/views/profiles/notifications/show.html.haml
app/views/profiles/notifications/show.html.haml
+4
-5
No files found.
app/views/profiles/notifications/_email_settings.html.haml
View file @
977e30c8
...
...
@@ -5,6 +5,4 @@
.help-block
=
local_assigns
.
fetch
(
:help_text
,
nil
)
.form-group
%label
{
for:
'user_email_opted_in'
}
=
form
.
check_box
:email_opted_in
%span
=
_
(
'Receive product marketing emails'
)
=
form
.
gitlab_ui_checkbox_component
:email_opted_in
,
_
(
'Receive product marketing emails'
)
This diff is collapsed.
Click to expand it.
app/views/profiles/notifications/show.html.haml
View file @
977e30c8
...
...
@@ -23,7 +23,7 @@
%h5
.gl-mt-0
=
_
(
'Global notification settings'
)
=
form_for
@user
,
url:
profile_notifications_path
,
method: :put
,
html:
{
class:
'update-notifications gl-mt-3'
}
do
|
f
|
=
gitlab_ui_
form_for
@user
,
url:
profile_notifications_path
,
method: :put
,
html:
{
class:
'update-notifications gl-mt-3'
}
do
|
f
|
=
render_if_exists
'profiles/notifications/email_settings'
,
form:
f
=
label_tag
:global_notification_level
,
"Global notification level"
,
class:
"label-bold"
...
...
@@ -35,10 +35,9 @@
.clearfix
=
form_for
@user
,
url:
profile_notifications_path
,
method: :put
do
|
f
|
%label
{
for:
'user_notified_of_own_activity'
}
=
f
.
check_box
:notified_of_own_activity
%span
=
_
(
'Receive notifications about your own activity'
)
=
gitlab_ui_form_for
@user
,
url:
profile_notifications_path
,
method: :put
do
|
f
|
.form-group
=
f
.
gitlab_ui_checkbox_component
:notified_of_own_activity
,
_
(
'Receive notifications about your own activity'
)
%hr
%h5
...
...
This diff is collapsed.
Click to expand it.
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