Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DojoBackendAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
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
Dojo Project (HES-SO)
Projects
Backend
DojoBackendAPI
Compare revisions
c0f02b1af2cb1f19ebf172721fdc09790f0afc35 to 351f58b45b317646e9f3c7820b00a727c4c311b6
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
dojo_project/projects/backend/dojobackendapi
Select target project
No results found
351f58b45b317646e9f3c7820b00a727c4c311b6
Select Git revision
Branches
add_route_assignments
ask-user-to-delete-exercises-on-duplicates
bedran_exercise-list
jw_sonar
jw_sonar_backup
main
update-dependencies
v6.0.0
Tags
2.0.0
2.1.0
2.2.0
3.0.0
3.0.1
3.1.0
3.1.1
3.1.2
3.1.3
3.2.0
3.3.0
3.4.0
3.4.1
3.4.2
3.5.0
3.5.1
3.5.2
3.5.3
4.0.0
4.1.0
5.0.0
5.0.1
6.0.0-dev
v1.0.1
32 results
Swap
Target
dojo_project/projects/backend/dojobackendapi
Select target project
Dojo_Project_Nguyen/backend/dojobackendapi
dojo_project/projects/backend/dojobackendapi
2 results
c0f02b1af2cb1f19ebf172721fdc09790f0afc35
Select Git revision
Branches
add_route_assignments
ask-user-to-delete-exercises-on-duplicates
bedran_exercise-list
jw_sonar
jw_sonar_backup
main
update-dependencies
v6.0.0
Tags
2.0.0
2.1.0
2.2.0
3.0.0
3.0.1
3.1.0
3.1.1
3.1.2
3.1.3
3.2.0
3.3.0
3.4.0
3.4.1
3.4.2
3.5.0
3.5.1
3.5.2
3.5.3
4.0.0
4.1.0
5.0.0
5.0.1
6.0.0-dev
v1.0.1
32 results
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
GlobalRoutes => ClientsConfig: Add max exercises per assignment information
· 9d7b90b7
michael.minelli
authored
2 months ago
9d7b90b7
Merge branch 'ask-user-to-delete-exercises-on-duplicates' into v6.0.0
· 351f58b4
michael.minelli
authored
2 months ago
351f58b4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ExpressAPI/src/routes/BaseRoutes.ts
+5
-4
5 additions, 4 deletions
ExpressAPI/src/routes/BaseRoutes.ts
with
5 additions
and
4 deletions
ExpressAPI/src/routes/BaseRoutes.ts
View file @
351f58b4
...
...
@@ -23,10 +23,11 @@ class BaseRoutes implements RoutesManager {
private
async
clientsConfig
(
req
:
express
.
Request
,
res
:
express
.
Response
)
{
return
req
.
session
.
sendResponse
(
res
,
StatusCodes
.
OK
,
{
gitlabUrl
:
Config
.
gitlab
.
url
,
gitlabAccountId
:
Config
.
gitlab
.
account
.
id
,
gitlabAccountUsername
:
Config
.
gitlab
.
account
.
username
,
loginGitlabClientId
:
Config
.
login
.
gitlab
.
client
.
id
gitlabUrl
:
Config
.
gitlab
.
url
,
gitlabAccountId
:
Config
.
gitlab
.
account
.
id
,
gitlabAccountUsername
:
Config
.
gitlab
.
account
.
username
,
loginGitlabClientId
:
Config
.
login
.
gitlab
.
client
.
id
,
exerciseMaxPerAssignment
:
Config
.
exercise
.
maxPerAssignment
});
}
}
...
...
This diff is collapsed.
Click to expand it.