Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
condenser
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
hive
condenser
Merge requests
!80
Something went wrong on our end
Pending changes from develop
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Pending changes from develop
develop
into
master
Overview
0
Commits
29
Pipelines
0
Changes
1
Merged
Gandalf
requested to merge
develop
into
master
4 years ago
Overview
0
Commits
29
Pipelines
0
Changes
1
Expand
0
0
Merge request reports
Viewing commit
f1436550
Prev
Next
Show latest version
1 file
+
8
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
f1436550
Merge branch '69-profile-settings-are-broken' into 'develop'
· f1436550
Jason Salyers
authored
4 years ago
Resolve "Profile settings are broken" Closes
#69
See merge request
!79
src/app/components/modules/Settings.jsx
+
8
−
2
Options
@@ -285,7 +285,11 @@ class Settings extends React.Component {
//this one is always present even if the api config call fails
if
(
endpoint
!==
preferred_api_endpoint
)
{
const
entry
=
<
option
value
=
{
endpoint
}
>
{
endpoint
}
</
option
>;
const
entry
=
(
<
option
key
=
{
endpoint
}
value
=
{
endpoint
}
>
{
endpoint
}
</
option
>
);
entries
.
push
(
entry
);
}
}
@@ -737,7 +741,9 @@ function read_profile_v2(account) {
// use new `posting_json_md` if {version: 2} is present
let
md
=
o2j
.
ifStringParseJSON
(
account
.
get
(
'
posting_json_metadata
'
));
md
.
profile
.
account_is_witness
=
accountIsWitness
;
if
(
md
&&
md
.
profile
&&
md
.
profile
.
account_is_witness
)
{
md
.
profile
.
account_is_witness
=
accountIsWitness
;
}
if
(
md
&&
md
.
profile
&&
md
.
profile
.
version
)
return
md
;
// otherwise, fall back to `json_metadata`
Loading