Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
admin-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
Pleroma
admin-fe
Commits
1785b178
Commit
1785b178
authored
4 years ago
by
feld
Browse files
Options
Downloads
Plain Diff
Merge branch 'cherry-pick-
d021c77a
' into 'release/2.0.2'
Merge branch 'fix/emails-with-symbols' into 'master' See merge request
!113
parents
65af72bd
95729814
No related branches found
No related tags found
3 merge requests
!119
Hide Invites from menu when invites are disabled
,
!116
AdminFE 2.0.2 release
,
!113
Merge branch 'fix/emails-with-symbols' into 'master'
Pipeline
#24076
passed
4 years ago
Stage: build
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/api/invites.js
+4
-5
4 additions, 5 deletions
src/api/invites.js
with
4 additions
and
5 deletions
src/api/invites.js
+
4
−
5
View file @
1785b178
...
@@ -13,14 +13,13 @@ export async function generateInviteToken(max_use, expires_at, authHost, token)
...
@@ -13,14 +13,13 @@ export async function generateInviteToken(max_use, expires_at, authHost, token)
}
}
export
async
function
inviteViaEmail
(
email
,
name
,
authHost
,
token
)
{
export
async
function
inviteViaEmail
(
email
,
name
,
authHost
,
token
)
{
const
url
=
name
.
length
>
0
const
data
=
name
.
length
>
0
?
{
email
,
name
}
:
{
email
}
?
`/api/pleroma/admin/users/email_invite?email=
${
email
}
&name=
${
name
}
`
:
`/api/pleroma/admin/users/email_invite?email=
${
email
}
`
return
await
request
({
return
await
request
({
baseURL
:
baseName
(
authHost
),
baseURL
:
baseName
(
authHost
),
url
,
url
:
'
/api/pleroma/admin/users/email_invite
'
,
method
:
'
post
'
,
method
:
'
post
'
,
headers
:
authHeaders
(
token
)
headers
:
authHeaders
(
token
),
data
})
})
}
}
...
...
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