Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • User Account User Account
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • m4lab_tv1
  • User AccountUser Account
  • Merge requests
  • !33
An error occurred while fetching the assigned milestone of the selected merge_request.

Prepare production

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Wolfgang Knopki requested to merge prepare_production into master 5 years ago
  • Overview 0
  • Commits 4
  • Pipelines 0
  • Changes 2

merge changes in M4_Lab project page layout

  • Wolfgang Knopki @knopkiwg added 5 commits 5 years ago

    added 5 commits

    • 6da9a2ad...e0199f9d - 4 commits from branch master
    • edc8354b - Merge branch 'master' into 'prepare_production'

    Compare with previous version

  • Wolfgang Knopki @knopkiwg merged 5 years ago

    merged

  • Wolfgang Knopki @knopkiwg mentioned in commit 4c993c49 5 years ago

    mentioned in commit 4c993c49

  • Loading
  • Loading
  • Loading
  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
Compare
  • version 1
    6da9a2ad
    5 years ago

  • master (base)

and
  • latest version
    edc8354b
    4 commits, 5 years ago

  • version 1
    6da9a2ad
    3 commits, 5 years ago

2 files
+ 1
- 6

    Preferences

    File browser
    Compare changes
con‎fig‎
conf‎ig.js‎ +0 -1
views/DE‎/project‎
projectOv‎erview.pug‎ +1 -5
config/config.js
+ 0
- 1
  • View file @ edc8354b

  • Edit in single-file editor

  • Open in Web IDE


@@ -10,7 +10,6 @@ module.exports = {
path: process.env.SAML_PATH || '/saml/SSO',
entryPoint: process.env.SAML_ENTRY_POINT || 'https://transfer.hft-stuttgart.de/idp/saml2/idp/SSOService.php',
//issuer: 'sp-account.m4lab.hft-stuttgart.de', //local metadata
//issuer: 'sp-account-testing.m4lab.hft-stuttgart.de', //testing metadata
issuer: 'sp-account-prod.m4lab.hft-stuttgart.de', //production metadata
logoutUrl: 'https://transfer.hft-stuttgart.de/idp/saml2/idp/SingleLogoutService.php'
}
views/DE/project/projectOverview.pug
+ 1
- 5
  • View file @ edc8354b

  • Edit in single-file editor

  • Open in Web IDE


@@ -144,9 +144,6 @@ html(lang="de")
if project.pname == 'M4LAB'
div(class="Downloads" style="height:200px;")
h5 Downloads
p
i(class="fas fa-file-download")
a(href="./images/M4_LAB_Projekt/transferstrategie.pdf" download target="_blank") Transferstrategie der HfT Stuttgart
div(class="Projektlogos")
img(src="./images/M4_LAB_Projekt/WRS_Logo.jpg" width="32%")
@@ -154,8 +151,7 @@ html(lang="de")
img(src="./images/M4_LAB_Projekt/GWK_Logo.jpg" width="32%")
br
br
img(src="./images/M4_LAB_Projekt/bbf_logo.png" width="32%")
img(src="./images/M4_LAB_Projekt/ihs_logo.jpg" width="32%")
img(src="./images/M4_LAB_Projekt/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.png" width="100%")
//jQuery
script(src="https://code.jquery.com/jquery-3.3.1.min.js")
Assignee
Wolfgang Knopki's avatar
Wolfgang Knopki
Assign to
0 Reviewers
None
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
0
0 participants
Reference:
Source branch: prepare_production

Menu

Explore Projects Groups Snippets

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal