BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
1b447b16
Commit
1b447b16
authored
Dec 29, 2017
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/profile-settings-sidebar-heading' into 'master'
Keep typographic hierarchy in User Settings See merge request gitlab-org/gitlab-ce!16090
parents
cdda83eb
05b97af3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
audit_log.html.haml
app/views/profiles/audit_log.html.haml
+1
-1
show.html.haml
app/views/profiles/notifications/show.html.haml
+3
-3
fix-profile-settings-sidebar-heading.yml
...elogs/unreleased/fix-profile-settings-sidebar-heading.yml
+5
-0
No files found.
app/views/profiles/audit_log.html.haml
View file @
1b447b16
...
...
@@ -4,7 +4,7 @@
.row.prepend-top-default
.col-lg-4.profile-settings-sidebar
%h
3
.prepend-top-0
%h
4
.prepend-top-0
=
page_title
%p
This is a security log of important events involving your account.
...
...
app/views/profiles/notifications/show.html.haml
View file @
1b447b16
...
...
@@ -10,16 +10,16 @@
%li
=
msg
=
hidden_field_tag
:notification_type
,
'global'
.row
.row
.prepend-top-default
.col-lg-4.profile-settings-sidebar
%h4
%h4
.prepend-top-0
=
page_title
%p
You can specify notification level per group or per project.
%p
By default, all projects and groups will use the global notifications setting.
.col-lg-8
%h5
%h5
.prepend-top-0
Global notification settings
=
form_for
@user
,
url:
profile_notifications_path
,
method: :put
,
html:
{
class:
'update-notifications prepend-top-default'
}
do
|
f
|
...
...
changelogs/unreleased/fix-profile-settings-sidebar-heading.yml
0 → 100644
View file @
1b447b16
---
title
:
Keep typographic hierarchy in User Settings
merge_request
:
16090
author
:
George Tsiolis
type
:
fixed
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