Merge branch 'hotline#157512_pb_reservation' into 'master' (8232cad3) · Commits · afi / opacce · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

opacce
- Activity
- Members
- Labels
- Issues
  2
- Issue boards
- Milestones
- Wiki
- Releases
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

afi
opacce
Commits
8232cad3

Commit 8232cad3 authored 2 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge branch 'hotline#157512_pb_reservation' into 'master'

hotline #157512 fix hold link in Chili template

See merge request !4477

parents 1776cd5d a4a17c1a

Branches

Tags

2 merge requests!4505hotline#147634 : pre-registration : mail sent now can use placeholders...,!4477hotline #157512 fix hold link in Chili template

Pipeline #17734 passed with stage

in 24 minutes and 4 seconds

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/157512 1 addition, 0 deletions

VERSIONS_HOTLINE/157512
library/templates/Intonation/Library/View/Wrapper/Record/RichContent.php 2 additions, 2 deletions

...es/Intonation/Library/View/Wrapper/Record/RichContent.php
library/templates/Intonation/View/Jumbotron.php 34 additions, 5 deletions

library/templates/Intonation/View/Jumbotron.php
library/templates/Intonation/View/RenderActions.php 2 additions, 2 deletions

library/templates/Intonation/View/RenderActions.php
library/templates/Intonation/View/RenderRecord/RenderItems.php 2 additions, 1 deletion

...ry/templates/Intonation/View/RenderRecord/RenderItems.php
tests/scenarios/Templates/ChiliItemsTest.php 37 additions, 40 deletions

tests/scenarios/Templates/ChiliItemsTest.php
tests/scenarios/Templates/TemplatesRecordsTest.php 110 additions, 0 deletions

tests/scenarios/Templates/TemplatesRecordsTest.php

with 188 additions and 50 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment