Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
funkwhale
Manage
Activity
Members
Labels
Plan
Issues
486
Issue boards
Milestones
Wiki
Code
Merge requests
19
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
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
funkwhale
funkwhale
Commits
fedfc67e
Commit
fedfc67e
authored
7 months ago
by
Petitminion
Committed by
petitminion
7 months ago
Browse files
Options
Downloads
Patches
Plain Diff
nodeinfo2.1 should be on v2 api
parent
04d28186
No related branches found
No related tags found
1 merge request
!2790
migrate frontend to api V2 (#2324)
Pipeline
#36400
passed with warnings with stages
in 18 minutes and 32 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
front/cypress/support/commands.ts
+1
-1
1 addition, 1 deletion
front/cypress/support/commands.ts
front/src/views/ChooseInstance.vue
+1
-1
1 addition, 1 deletion
front/src/views/ChooseInstance.vue
with
2 additions
and
2 deletions
front/cypress/support/commands.ts
+
1
−
1
View file @
fedfc67e
Cypress
.
Commands
.
add
(
'
login
'
,
()
=>
{
Cypress
.
Commands
.
add
(
'
login
'
,
()
=>
{
cy
.
fixture
(
'
testuser.json
'
).
then
(({
username
,
password
})
=>
{
cy
.
fixture
(
'
testuser.json
'
).
then
(({
username
,
password
})
=>
{
// We need to request a page that sets the csrf cookie
// We need to request a page that sets the csrf cookie
cy
.
request
(
'
/api/v
1
/instance/nodeinfo/2.1/
'
)
cy
.
request
(
'
/api/v
2
/instance/nodeinfo/2.1/
'
)
cy
.
getCookie
(
'
csrftoken
'
).
then
((
$cookie
)
=>
{
cy
.
getCookie
(
'
csrftoken
'
).
then
((
$cookie
)
=>
{
cy
.
request
({
cy
.
request
({
...
...
This diff is collapsed.
Click to expand it.
front/src/views/ChooseInstance.vue
+
1
−
1
View file @
fedfc67e
...
@@ -35,7 +35,7 @@ const checkAndSwitch = async (url: string) => {
...
@@ -35,7 +35,7 @@ const checkAndSwitch = async (url: string) => {
try
{
try
{
const
instanceUrl
=
new
URL
(
url
.
startsWith
(
'
https://
'
)
||
url
.
startsWith
(
'
http://
'
)
?
url
:
`https://
${
url
}
`
).
origin
const
instanceUrl
=
new
URL
(
url
.
startsWith
(
'
https://
'
)
||
url
.
startsWith
(
'
http://
'
)
?
url
:
`https://
${
url
}
`
).
origin
await
axios
.
get
(
instanceUrl
+
'
/api/v
1
/instance/nodeinfo/2.1/
'
)
await
axios
.
get
(
instanceUrl
+
'
/api/v
2
/instance/nodeinfo/2.1/
'
)
store
.
commit
(
'
ui/addMessage
'
,
{
store
.
commit
(
'
ui/addMessage
'
,
{
content
:
t
(
'
views.ChooseInstance.message.newUrl
'
,
{
url
:
instanceUrl
}),
content
:
t
(
'
views.ChooseInstance.message.newUrl
'
,
{
url
:
instanceUrl
}),
...
...
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