Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
org.etsi.osl.portal.web
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
OSL
code
org.etsi.osl.portal.web
Commits
059612e2
Commit
059612e2
authored
1 month ago
by
trantzas
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' into 'main'
MR for Release 2024Q4
parents
0dd9e63d
1b8a4d7b
No related branches found
No related tags found
2 merge requests
!9
Merge branch 'main' into 'develop'
,
!8
MR for Release 2024Q4
Pipeline
#11321
passed
1 month ago
Stage: build
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yml
src/Footer.html
+1
-1
1 addition, 1 deletion
src/Footer.html
with
3 additions
and
3 deletions
.gitlab-ci.yml
+
2
−
2
View file @
059612e2
...
...
@@ -21,7 +21,7 @@ include:
-
ci-templates/default.yml
-
ci-templates/build.yml
rules
:
-
if
:
'
$CI_COMMIT_REF_PROTECTED
&&
$CI_COMMIT_REF_NAME
!=
"main"
&&
$CI_COMMIT_REF_NAME
!=
"develop"'
-
if
:
'
$CI_COMMIT_REF_PROTECTED
==
"true"
&&
$CI_COMMIT_REF_NAME
!=
"main"
&&
$CI_COMMIT_REF_NAME
!=
"develop"'
-
project
:
osl/code/org.etsi.osl.main
ref
:
develop
...
...
@@ -29,7 +29,7 @@ include:
-
ci-templates/default.yml
-
ci-templates/build_unprotected.yml
rules
:
-
if
:
'
$CI_COMMIT_REF_NAME
!=
"main"
&&
$CI_COMMIT_REF_NAME
!=
"develop"
&&
!
$CI_COMMIT_REF_PROTECTED'
-
if
:
'
$CI_COMMIT_REF_NAME
!=
"main"
&&
$CI_COMMIT_REF_NAME
!=
"develop"
&&
$CI_COMMIT_REF_PROTECTED
==
"false"
'
docker_build
:
extends
:
.docker_build
This diff is collapsed.
Click to expand it.
src/Footer.html
+
1
−
1
View file @
059612e2
...
...
@@ -53,7 +53,7 @@
OpenSlice has received funding from various projects under European Programmes for research, technological development
and demonstration. You may refer to our extensive
<a
href=
"https://osl.etsi.org/ecosystem/"
>
ecosystem
</a>
for further details.
</div>
<div
class=
'font-weight-light'
>
{{portalName}} running OSL version version 2024Q
2
|
<div
class=
'font-weight-light'
>
{{portalName}} running OSL version version 2024Q
4
|
<a
href=
'https://osl.etsi.org/files/SDG_OSL_Terms_and_Conditions.pdf'
class=
'font-weight-light'
>
Terms and Conditions
</a>
|
©
{{currentYear}} on behalf of
<a
target=
'_blank'
href=
'https://osl.etsi.org/'
title=
'osl.etsi.org'
class=
'font-weight-light'
>
osl.etsi.org
</a>
</div>
...
...
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