Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Castopod
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
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ad Aures
Castopod
Commits
711843a0
Commit
711843a0
authored
2 years ago
by
Yassine Doghri
Browse files
Options
Downloads
Patches
Plain Diff
feat: add legalNoticeURL to app config for setting an external url to legal notice
parent
98a8a480
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!230
feat: add legalNoticeURL to app config for setting an external url to legal notice
Pipeline
#6716
passed
2 years ago
Stage: prepare
Stage: quality
Stage: bundle
Stage: build
Pipeline: Castopod
#6717
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
app/Config/App.php
+2
-0
2 additions, 0 deletions
app/Config/App.php
app/Helpers/page_helper.php
+9
-0
9 additions, 0 deletions
app/Helpers/page_helper.php
app/Language/en/Common.php
+1
-0
1 addition, 0 deletions
app/Language/en/Common.php
with
13 additions
and
1 deletion
.gitlab-ci.yml
+
1
−
1
View file @
711843a0
...
...
@@ -75,7 +75,7 @@ tests:
MYSQL_PASSWORD
:
"
castopod"
script
:
-
apt-get install -y mariadb-client libmariadb-dev
-
apt-get
update && apt-get
install -y mariadb-client libmariadb-dev
-
echo "SHOW DATABASES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mariadb "$MYSQL_DATABASE"
...
...
This diff is collapsed.
Click to expand it.
app/Config/App.php
+
2
−
0
View file @
711843a0
...
...
@@ -456,4 +456,6 @@ class App extends BaseConfig
* Storage limit in Gigabytes
*/
public
?int
$storageLimit
=
null
;
public
?string
$legalNoticeURL
=
null
;
}
This diff is collapsed.
Click to expand it.
app/Helpers/page_helper.php
+
9
−
0
View file @
711843a0
...
...
@@ -34,6 +34,15 @@ if (! function_exists('render_page_links')) {
]);
}
// if set in .env, add legal notice link at the end of page links
if
(
config
(
'App'
)
->
legalNoticeURL
!==
null
)
{
$links
.
=
anchor
(
config
(
'App'
)
->
legalNoticeURL
,
lang
(
'Common.legal_notice'
),
[
'class'
=>
'px-2 py-1 underline hover:no-underline focus:ring-accent'
,
'target'
=>
'_blank'
,
'rel'
=>
'noopener noreferrer'
,
]);
}
return
'<nav class="'
.
$class
.
'">'
.
$links
.
'</nav>'
;
}
}
This diff is collapsed.
Click to expand it.
app/Language/en/Common.php
+
1
−
0
View file @
711843a0
...
...
@@ -26,4 +26,5 @@ return [
'read_less'
=>
'Read less'
,
'see_more'
=>
'See more'
,
'see_less'
=>
'See less'
,
'legal_notice'
=>
'Legal notice'
,
];
This diff is collapsed.
Click to expand it.
Yassine Doghri
@yassinedoghri
mentioned in commit
455efae0
·
2 years ago
mentioned in commit
455efae0
mentioned in commit 455efae00f01a32e14e126bc8027d0a91ef3a970
Toggle commit list
Yassine Doghri
@yassinedoghri
mentioned in commit
f9572e41
·
2 years ago
mentioned in commit
f9572e41
mentioned in commit f9572e4125ed53c215cc4a3c4d1a32708e6febe3
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment