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
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
Angelina Filippova
admin-fe
Commits
497176e5
Commit
497176e5
authored
5 years ago
by
Angelina Filippova
Browse files
Options
Downloads
Plain Diff
Merge branch 'feature/invites' of git.pleroma.social:linafilippova/admin-fe into feature/invites
parents
9fce1b2f
7b30e7f4
No related branches found
No related tags found
No related merge requests found
Pipeline
#17499
passed
5 years ago
Stage: lint
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/store/modules/invites.js
+2
-2
2 additions, 2 deletions
src/store/modules/invites.js
src/views/invites/index.vue
+1
-1
1 addition, 1 deletion
src/views/invites/index.vue
with
3 additions
and
3 deletions
src/store/modules/invites.js
+
2
−
2
View file @
497176e5
...
...
@@ -14,14 +14,14 @@ const invites = {
state
.
newToken
=
token
},
SET_TOKENS
:
(
state
,
tokens
)
=>
{
state
.
inviteTokens
=
tokens
.
reverse
()
state
.
inviteTokens
=
tokens
}
},
actions
:
{
async
FetchInviteTokens
({
commit
,
getters
})
{
commit
(
'
SET_LOADING
'
,
true
)
const
response
=
await
listInviteTokens
(
getters
.
authHost
,
getters
.
token
)
commit
(
'
SET_TOKENS
'
,
response
.
data
.
invites
)
commit
(
'
SET_TOKENS
'
,
response
.
data
.
invites
.
reverse
()
)
commit
(
'
SET_LOADING
'
,
false
)
},
async
GenerateInviteToken
({
commit
,
dispatch
,
getters
},
{
maxUse
,
expiresAt
})
{
...
...
This diff is collapsed.
Click to expand it.
src/views/invites/index.vue
+
1
−
1
View file @
497176e5
...
...
@@ -225,7 +225,7 @@ export default {
}
},
validEmail
(
email
)
{
var
re
=
/^
[
a-zA-Z0-9.!#$%&'*+
\/
=?^_`{|}~-
]
+@
[
a-zA-Z0-9
](?:[
a-zA-Z0-9-
]{0,61}[
a-zA-Z0-9
])?(?:\.[
a-zA-Z0-9
](?:[
a-zA-Z0-9-
]{0,61}[
a-zA-Z0-9
])?)
*$/
const
re
=
/^
[
a-zA-Z0-9.!#$%&'*+
\/
=?^_`{|}~-
]
+@
[
a-zA-Z0-9
](?:[
a-zA-Z0-9-
]{0,61}[
a-zA-Z0-9
])?(?:\.[
a-zA-Z0-9
](?:[
a-zA-Z0-9-
]{0,61}[
a-zA-Z0-9
])?)
*$/
return
re
.
test
(
email
)
}
}
...
...
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