Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
NodeClientSharedCode
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
Shared
NodeClientSharedCode
Compare revisions
ce495680ad5fe004f65f7b062660280077d23909 to c4efbcfb2a50e7108e101fb673e84f87fad8e246
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/shared/nodeclientsharedcode
Select target project
No results found
c4efbcfb2a50e7108e101fb673e84f87fad8e246
Select Git revision
Branches
ask-user-to-delete-exercises-on-duplicates
jw_sonar
jw_sonar_backup
main
move-to-esm-only
open_tool_for_self_hosting
v5.0
v6.0
Tags
v4.1
v4.2
10 results
Swap
Target
dojo_project/projects/shared/nodeclientsharedcode
Select target project
dojo_project/projects/shared/nodeclientsharedcode
1 result
ce495680ad5fe004f65f7b062660280077d23909
Select Git revision
Branches
ask-user-to-delete-exercises-on-duplicates
jw_sonar
jw_sonar_backup
main
move-to-esm-only
open_tool_for_self_hosting
v5.0
v6.0
Tags
v4.1
v4.2
10 results
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
Sonar => Resolve issues
· 9e75273d
michael.minelli
authored
1 year ago
9e75273d
Merge branch 'add-sonar-integration' into v3.6
· c4efbcfb
michael.minelli
authored
1 year ago
c4efbcfb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
config/ClientsSharedConfig.ts
+8
-8
8 additions, 8 deletions
config/ClientsSharedConfig.ts
helpers/Dojo/AssignmentValidator.ts
+2
-2
2 additions, 2 deletions
helpers/Dojo/AssignmentValidator.ts
models/Exercise.ts
+2
-2
2 additions, 2 deletions
models/Exercise.ts
with
12 additions
and
12 deletions
config/ClientsSharedConfig.ts
View file @
c4efbcfb
...
...
@@ -21,28 +21,28 @@ class ClientsSharedConfig {
constructor
()
{
this
.
apiURL
=
process
.
env
.
API_URL
||
''
;
this
.
apiURL
=
process
.
env
.
API_URL
??
''
;
this
.
assignment
=
{
filename
:
process
.
env
.
ASSIGNMENT_FILENAME
||
''
,
neededFiles
:
JSON
.
parse
(
process
.
env
.
EXERCISE_NEEDED_FILES
||
'
[]
'
)
filename
:
process
.
env
.
ASSIGNMENT_FILENAME
??
''
,
neededFiles
:
JSON
.
parse
(
process
.
env
.
EXERCISE_NEEDED_FILES
??
'
[]
'
)
};
this
.
gitlab
=
{
dojoAccount
:
{
id
:
Number
(
process
.
env
.
GITLAB_DOJO_ACCOUNT_ID
)
||
-
1
,
username
:
process
.
env
.
GITLAB_DOJO_ACCOUNT_USERNAME
||
''
id
:
Number
(
process
.
env
.
GITLAB_DOJO_ACCOUNT_ID
??
-
1
)
,
username
:
process
.
env
.
GITLAB_DOJO_ACCOUNT_USERNAME
??
''
}
};
this
.
dockerCompose
=
{
projectName
:
process
.
env
.
DOCKER_COMPOSE_PROJECT_NAME
||
''
projectName
:
process
.
env
.
DOCKER_COMPOSE_PROJECT_NAME
??
''
};
this
.
exerciseResultsFolderMaxSizeInBytes
=
Number
(
process
.
env
.
EXERCISE_RESULTS_FOLDER_MAX_SIZE_IN_BYTES
||
0
);
this
.
exerciseResultsFolderMaxSizeInBytes
=
Number
(
process
.
env
.
EXERCISE_RESULTS_FOLDER_MAX_SIZE_IN_BYTES
??
0
);
this
.
filenames
=
{
results
:
process
.
env
.
EXERCISE_RESULTS_FILENAME
||
''
results
:
process
.
env
.
EXERCISE_RESULTS_FILENAME
??
''
};
}
}
...
...
This diff is collapsed.
Click to expand it.
helpers/Dojo/AssignmentValidator.ts
View file @
c4efbcfb
...
...
@@ -196,7 +196,7 @@ class AssignmentValidator {
});
dockerComposeValidation
.
on
(
'
exit
'
,
code
=>
{
code
!==
null
&&
code
===
0
?
resolve
()
:
reject
();
code
!==
null
&&
code
===
0
?
resolve
()
:
reject
(
code
);
});
});
}
catch
(
error
)
{
...
...
@@ -271,7 +271,7 @@ class AssignmentValidator {
});
exerciseDockerCompose
.
events
.
on
(
'
finished
'
,
(
_success
:
boolean
,
exitCode
:
number
)
=>
{
exitCode
!==
0
?
resolve
()
:
reject
();
exitCode
!==
0
?
resolve
()
:
reject
(
exitCode
);
});
exerciseDockerCompose
.
run
(
this
.
doDown
);
...
...
This diff is collapsed.
Click to expand it.
models/Exercise.ts
View file @
c4efbcfb
import
GitlabRepository
from
'
../../shared/types/Gitlab/GitlabRepository
'
;
import
{
CommitSchema
}
from
'
@gitbeaker/rest
'
;
import
*
as
Gitlab
from
'
@gitbeaker/rest
'
;
import
User
from
'
./User
'
;
import
Assignment
from
'
./Assignment
'
;
...
...
@@ -18,7 +18,7 @@ interface Exercise {
assignment
:
Assignment
|
undefined
;
isCorrection
:
boolean
;
correctionCommit
:
CommitSchema
|
undefined
;
correctionCommit
:
Gitlab
.
CommitSchema
|
undefined
;
}
...
...
This diff is collapsed.
Click to expand it.