Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support pages with gitlab relative path #2573

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

support pages with gitlab relative path #2573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
242e518
support relative gitlab path with pages
th-2021 May 27, 2022
d9cc864
support relative path with pages
th-2021 May 27, 2022
a56c97d
Merge branch 'sameersbn:master' into master
th-2021 Apr 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/runtime/config/gitlab-pages/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ auth-redirect-uri={{GITLAB_PAGES_ACCESS_REDIRECT_URI}}
auth-secret={{GITLAB_PAGES_ACCESS_SECRET}}
gitlab-server={{GITLAB_PAGES_ACCESS_CONTROL_SERVER}}
artifacts-server={{GITLAB_PAGES_ARTIFACTS_SERVER_URL}}
internal-gitlab-server=http://localhost:8181
internal-gitlab-server=http://localhost:8181{{GITLAB_RELATIVE_URL_ROOT}}
api-secret-key={{GITLAB_INSTALL_DIR}}/.gitlab_pages_secret
2 changes: 2 additions & 0 deletions assets/runtime/functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2113,6 +2113,7 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
fi

update_template ${GITLAB_PAGES_CONFIG} \
GITLAB_RELATIVE_URL_ROOT \
GITLAB_PAGES_ACCESS_CLIENT_ID \
GITLAB_PAGES_ACCESS_CLIENT_SECRET \
GITLAB_PAGES_ACCESS_REDIRECT_URI \
Expand All @@ -2127,6 +2128,7 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
fi
else
update_template ${GITLAB_PAGES_CONFIG} \
GITLAB_RELATIVE_URL_ROOT \
GITLAB_INSTALL_DIR

exec_as_git sed -i "/{{GITLAB_PAGES_ACCESS_CLIENT_ID}}/d" ${GITLAB_PAGES_CONFIG}
Expand Down