diff options
| author | Jaime Martinez <jmartinez@gitlab.com> | 2023-06-08 09:54:32 +0300 |
|---|---|---|
| committer | Jaime Martinez <jmartinez@gitlab.com> | 2023-06-08 09:54:32 +0300 |
| commit | e64dbc90aec2a9e75e3e8b8141cb25ac0a89554f (patch) | |
| tree | ab4c8aea756d110ec1e676ee6088327809803b2e /Makefile.util.mk | |
| parent | 5a6388a4479dcfbd522a55b525127f9096e79cdc (diff) | |
| parent | 3cbfc605d0ede7e0a79d912fac01d610089f7eef (diff) | |
Merge branch '1056-use-pages-root-directory-from-api' into 'master'
Use pages root directory from API
Closes #1056
See merge request https://gitlab.com/gitlab-org/gitlab-pages/-/merge_requests/859
Merged-by: Jaime Martinez <jmartinez@gitlab.com>
Approved-by: Jaime Martinez <jmartinez@gitlab.com>
Reviewed-by: Kassio Borges <kborges@gitlab.com>
Reviewed-by: Jaime Martinez <jmartinez@gitlab.com>
Reviewed-by: Janis Altherr <jaltherr@gitlab.com>
Co-authored-by: janis <jaltherr@gitlab.com>
Diffstat (limited to 'Makefile.util.mk')
| -rw-r--r-- | Makefile.util.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.util.mk b/Makefile.util.mk index b0a282cf..25c7320d 100644 --- a/Makefile.util.mk +++ b/Makefile.util.mk @@ -70,4 +70,4 @@ endif zip: cd $(PWD)/shared/pages/$(PROJECT_SUBDIR)/ && \ - zip -r public.zip public/ + zip -r ../public.zip ./ |