T3Voila / templavoilaplus

TYPO3 Extension TemplaVoilà! Plus for TYPO3 8/9/10/11/12 LTS
https://extensions.typo3.org/extension/templavoilaplus/
GNU General Public License v2.0
26 stars 27 forks source link

[BUGFIX] fixes #502 (backport #503) #508

Closed mergify[bot] closed 1 year ago

mergify[bot] commented 1 year ago

This is an automatic backport of pull request #503 done by Mergify. Cherry-pick of 98f9183fbe30c28bea7db9daeaef140a9d547393 has failed:

On branch mergify/bp/8.1.x/pr-503
Your branch is up to date with 'origin/8.1.x'.

You are currently cherry-picking commit 98f9183f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both added:      Classes/Controller/Backend/LinkBrowserController.php
    both modified:   Configuration/Backend/Routes.php

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 21984ab90e9bacb975373bcfb13c30dbe787ad7d has failed:

On branch mergify/bp/8.1.x/pr-503
Your branch is ahead of 'origin/8.1.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 21984ab9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   Classes/Controller/Backend/LinkBrowserController.php
    both modified:   Configuration/Backend/Routes.php

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com
opi99 commented 1 year ago

@Mergifyio refresh

mergify[bot] commented 1 year ago

refresh

✅ Pull request refreshed

opi99 commented 1 year ago

This backport is wrong, the original commit was already for 8.1.x branch, my fault