Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
3c45dfa0
Unverified
Commit
3c45dfa0
authored
3 years ago
by
Claire
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix “discoverable” account setting being tied to profile directory (#16637)
parent
a2afcac7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/views/settings/profiles/show.html.haml
+2
-3
2 additions, 3 deletions
app/views/settings/profiles/show.html.haml
config/locales/simple_form.en.yml
+2
-1
2 additions, 1 deletion
config/locales/simple_form.en.yml
with
4 additions
and
4 deletions
app/views/settings/profiles/show.html.haml
+
2
−
3
View file @
3c45dfa0
...
...
@@ -29,9 +29,8 @@
.fields-group
=
f
.
input
:bot
,
as: :boolean
,
wrapper: :with_label
,
hint:
t
(
'simple_form.hints.defaults.bot'
)
-
if
Setting
.
profile_directory
.fields-group
=
f
.
input
:discoverable
,
as: :boolean
,
wrapper: :with_label
,
hint:
t
(
'simple_form.hints.defaults.discoverable'
),
recommended:
true
.fields-group
=
f
.
input
:discoverable
,
as: :boolean
,
wrapper: :with_label
,
hint:
t
(
Setting
.
profile_directory
?
'simple_form.hints.defaults.discoverable'
:
'simple_form.hints.defaults.discoverable_no_directory'
),
recommended:
true
%hr
.spacer
/
...
...
This diff is collapsed.
Click to expand it.
config/locales/simple_form.en.yml
+
2
−
1
View file @
3c45dfa0
...
...
@@ -35,7 +35,8 @@ en:
current_password
:
For security purposes please enter the password of the current account
current_username
:
To confirm, please enter the username of the current account
digest
:
Only sent after a long period of inactivity and only if you have received any personal messages in your absence
discoverable
:
Allow your account to be discovered by strangers through recommendations and other features
discoverable
:
Allow your account to be discovered by strangers through recommendations, profile directory and other features
discoverable_no_directory
:
Allow your account to be discovered by strangers through recommendations and other features
email
:
You will be sent a confirmation e-mail
fields
:
You can have up to 4 items displayed as a table on your profile
header
:
PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment