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
1a815e70
Commit
1a815e70
authored
Oct 01, 2018
by
Martin Wortschack
Committed by
Annabel Dunstone Gray
Oct 01, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Private profile help url should not toggle checkbox"
parent
df73116f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
3 deletions
+19
-3
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+10
-0
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+4
-3
changelogs/unreleased/51476-private-profile-help-url-should-not-toggle-checkbox.yml
...6-private-profile-help-url-should-not-toggle-checkbox.yml
+5
-0
No files found.
app/assets/stylesheets/framework/common.scss
View file @
1a815e70
...
@@ -324,6 +324,16 @@ img.emoji {
...
@@ -324,6 +324,16 @@ img.emoji {
word-wrap
:
break-word
;
word-wrap
:
break-word
;
}
}
.checkbox-icon-inline-wrapper
{
.checkbox
{
display
:
inline
;
label
{
display
:
inline
;
}
}
}
/** COMMON CLASSES **/
/** COMMON CLASSES **/
.prepend-top-0
{
margin-top
:
0
;
}
.prepend-top-0
{
margin-top
:
0
;
}
.prepend-top-2
{
margin-top
:
2px
;
}
.prepend-top-2
{
margin-top
:
2px
;
}
...
...
app/views/profiles/show.html.haml
View file @
1a815e70
...
@@ -109,10 +109,11 @@
...
@@ -109,10 +109,11 @@
=
f
.
text_area
:bio
,
rows:
4
,
maxlength:
250
,
help:
s_
(
"Profiles|Tell us about yourself in fewer than 250 characters."
)
=
f
.
text_area
:bio
,
rows:
4
,
maxlength:
250
,
help:
s_
(
"Profiles|Tell us about yourself in fewer than 250 characters."
)
%hr
%hr
%h5
=
(
"Private profile"
)
%h5
=
(
"Private profile"
)
-
private_profile_label
=
capture
do
.checkbox-icon-inline-wrapper
=
s_
(
"Profiles|Don't display activity-related personal information on your profiles"
)
-
private_profile_label
=
capture
do
=
s_
(
"Profiles|Don't display activity-related personal information on your profiles"
)
=
f
.
check_box
:private_profile
,
label:
private_profile_label
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'user/profile/index.md'
,
anchor:
'private-profile'
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'user/profile/index.md'
,
anchor:
'private-profile'
)
=
f
.
check_box
:private_profile
,
label:
private_profile_label
%h5
=
s_
(
"Profiles|Private contributions"
)
%h5
=
s_
(
"Profiles|Private contributions"
)
=
f
.
check_box
:include_private_contributions
,
label:
'Include private contributions on my profile'
=
f
.
check_box
:include_private_contributions
,
label:
'Include private contributions on my profile'
.help-block
.help-block
...
...
changelogs/unreleased/51476-private-profile-help-url-should-not-toggle-checkbox.yml
0 → 100644
View file @
1a815e70
---
title
:
Prevents private profile help link from toggling checkbox
merge_request
:
21757
author
:
type
:
other
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