Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
hifis.net
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
Model registry
Operate
Environments
Monitor
Incidents
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
HIFIS
Overall
hifis.net
Merge requests
!165
Draft:Hifis unified V0.2
Code
Review changes
Check out branch
Download
Patches
Plain diff
Closed
Draft:Hifis unified V0.2
hifis-unified-2
into
master
Overview
0
Commits
61
Pipelines
0
Changes
15
Closed
Uwe Jandt (DESY, HIFIS)
requested to merge
hifis-unified-2
into
master
4 years ago
Overview
0
Commits
61
Pipelines
0
Changes
15
Expand
resolved conflicts from branch
uj-hifis-overall
Edited
4 years ago
by
Uwe Jandt (DESY, HIFIS)
0
0
Merge request reports
Viewing commit
26eb9fcf
Prev
Next
Show latest version
15 files
+
465
−
35
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
15
Search (e.g. *.vue) (Ctrl+P)
26eb9fcf
Merge branch 'master' into 'hifis-unified-2'
· 26eb9fcf
Uwe Jandt (DESY, HIFIS)
authored
4 years ago
# Conflicts: # _data/navigation.yml
_layouts/partners.html
+
10
−
1
Options
@@ -14,7 +14,7 @@
<div
class=
"flex-content-wrapper"
>
<a
href=
"https://www.helmholtz.de/"
class=
"btn btn-light btn-lg btn-logo"
>
<img
src=
"{% link assets/img/third-party-logos/2017_Helmholtz_Logo_RGB_untereinander_EN.
pn
g %}"
<img
src=
"{% link assets/img/third-party-logos/2017_Helmholtz_Logo_RGB_untereinander_EN.
sv
g %}"
alt=
"Helmholtz Logo"
>
</a>
@@ -35,6 +35,15 @@
<a
href=
"https://www.helmholtz-imaging.de/"
class=
"btn btn-light btn-lg btn-logo"
>
<img
src=
"{% link assets/img/third-party-logos/hip-logo.png %}"
alt=
"HIP Logo"
>
</a>
<a
href=
"https://os.helmholtz.de/en/"
class=
"btn btn-light btn-lg btn-logo"
>
<img
src=
"{% link assets/img/third-party-logos/Helmholtz_Submarke_OS.png %}"
alt=
"Helmholtz Open Science Office Logo"
>
</a>
<a
href=
"https://www.helmholtz.de/en/jobs-talent/the-helmholtz-leadership-academy/leadership/"
class=
"btn btn-light btn-lg btn-logo"
>
<img
src=
"{% link assets/img/third-party-logos/Helmholtz_Leadership_Academy_2017_Helmholtz_Logo_RGB_untereinander_EN.svg %}"
alt=
"Helmholtz Leadership Academy Logo"
>
</a>
</div>
Loading