Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Pupple
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Automate
Agent sessions
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
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Labrador
Pupple
Merge requests
!12
Bug fix deploy
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Bug fix deploy
development
into
master
Overview
0
Commits
2
Pipelines
2
Changes
1
Merged
Bug fix deploy
Stefan Hugtenburg
requested to merge
development
into
master
Jan 12, 2024
Overview
0
Commits
2
Pipelines
2
Changes
1
Bugfix deploy
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
3289a070
2 commits,
Jan 12, 2024
1 file
+
1
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
src/main/resources/templates/puzzleList.html
+
1
−
3
View file @ 3289a070
Edit in single-file editor
Open in Web IDE
Show full file
@@ -82,9 +82,6 @@
</table>
<th-block
th:if=
"${@authorisationService.canAssignToDay() || @authorisationService.canEditPuzzlesOfUser(user)}"
>
<th:block
layout:replace=
"~{pagination :: pagination(page=${puzzles}, size=5)}"
></th:block>
<th-block
th:if=
"${param.unassigned == null}"
>
<a
class=
"link"
href=
"?unassigned"
>
<button
class=
"button"
>
Show unassigned puzzles
</button>
@@ -104,5 +101,6 @@
<a
class=
"link"
href=
"?"
><button
class=
"button"
>
Hide solutions
</button></a>
</th-block>
</th-block>
<th:block
layout:replace=
"~{pagination :: pagination(page=${puzzles}, size=5)}"
></th:block>
</div>
</html>
Loading