diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-05-25 16:31:26 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-05-25 16:31:26 +0300 |
| commit | ca22f5374e461ffa20879b1ae4d3217dc538f3e5 (patch) | |
| tree | c778788f7926efd5bbc674f481865e7a840961c4 | |
| parent | 2874a9e5a0c3eac9b4df1302eaecad7ddb9d0fc3 (diff) | |
| parent | 995c43658f0d921a9190881d5528333e60c5e644 (diff) | |
Merge branch 'rm-cookie' into 'master'
Make a separate cookies policy page
Closes #210
See merge request gitlab-com/gitlab-docs!275
| -rw-r--r-- | content/cookies-policy/index.md | 3 | ||||
| -rw-r--r-- | layouts/default.html | 1 | ||||
| -rw-r--r-- | layouts/footer.html | 1 | ||||
| -rw-r--r-- | layouts/home.html | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/content/cookies-policy/index.md b/content/cookies-policy/index.md new file mode 100644 index 00000000..3b8fce8a --- /dev/null +++ b/content/cookies-policy/index.md @@ -0,0 +1,3 @@ +# Cookies policy + +<script id="CookieDeclaration" src="https://consent.cookiebot.com/36a06ac5-ddb4-4f91-8337-067ad19ad8d5/cd.js" type="text/javascript" async></script> diff --git a/layouts/default.html b/layouts/default.html index ccadeb92..f216f11e 100644 --- a/layouts/default.html +++ b/layouts/default.html @@ -64,7 +64,6 @@ <script src="https://cdn.jsdelivr.net/npm/clipboard@2/dist/clipboard.min.js"></script> <script type="application/javascript" src="/assets/javascripts/clipboardjs.js"></script> <script type="application/javascript" src="/assets/javascripts/badges.js"></script> - <script id="CookieDeclaration" src="https://consent.cookiebot.com/36a06ac5-ddb4-4f91-8337-067ad19ad8d5/cd.js" type="text/javascript" async></script> <%= render '/footer.*' %> <%= render '/docsearch.*' %> <%= render '/analytics.*' %> diff --git a/layouts/footer.html b/layouts/footer.html index 28548362..478da4cc 100644 --- a/layouts/footer.html +++ b/layouts/footer.html @@ -3,6 +3,7 @@ <div class='animated text-center source-link'> <a href='https://gitlab.com/gitlab-com/gitlab-docs' target='_blank'>Created</a> with Nanoc, hosted on <a href='https://about.gitlab.com/features/pages/' target='_blank'>GitLab Pages</a> <a href='https://creativecommons.org/licenses/by-sa/4.0/' target='_blank' rel="license" alt="Creative Commons License"><img src='/assets/images/by-sa.svg'></a> + <a href='/cookies-policy/' alt='Cookies Policy'>Cookies Policy</a> <% if ENV['NANOC_ENV'] == 'production' && ENV['CI_COMMIT_REF_NAME'] == 'master' %> <%# Show Edit button only in production and on master branch (hide archives) %> <div class="edit-on"> diff --git a/layouts/home.html b/layouts/home.html index e8921434..7aba95bf 100644 --- a/layouts/home.html +++ b/layouts/home.html @@ -21,7 +21,6 @@ </div> </div> <%= yield %> - <script id="CookieDeclaration" src="https://consent.cookiebot.com/36a06ac5-ddb4-4f91-8337-067ad19ad8d5/cd.js" type="text/javascript" async></script> <%= render '/footer.*' %> <%= render '/docsearch.*' %> <%= render '/analytics.*' %> |