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
Commits
f1436550
Commit
f1436550
authored
4 years ago
by
Jason Salyers
Browse files
Options
Downloads
Plain Diff
Merge branch '69-profile-settings-are-broken' into 'develop'
Resolve "Profile settings are broken" Closes
#69
See merge request
!79
parents
7fd23db7
965f7335
No related branches found
Branches containing commit
No related tags found
2 merge requests
!80
Pending changes from develop
,
!79
Resolve "Profile settings are broken"
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/app/components/modules/Settings.jsx
+8
-2
8 additions, 2 deletions
src/app/components/modules/Settings.jsx
with
8 additions
and
2 deletions
src/app/components/modules/Settings.jsx
+
8
−
2
View file @
f1436550
...
...
@@ -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`
...
...
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