Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitlab-ci.yml8
-rw-r--r--.gitlab/merge_request_templates/Release.md4
-rw-r--r--Dockerfile.master10
-rw-r--r--README.md12
-rw-r--r--content/archives/index.html4
-rw-r--r--content/assets/stylesheets/stylesheet.scss4
-rw-r--r--dockerfiles/Dockerfile.archives40
-rw-r--r--dockerfiles/Dockerfile.builder.onbuild2
-rw-r--r--dockerfiles/Dockerfile.gitlab-docs-lint2
-rw-r--r--dockerfiles/Dockerfile.single8
-rw-r--r--dockerfiles/README.md12
-rw-r--r--layouts/canonical_urls.html2
-rw-r--r--layouts/footer.html2
-rw-r--r--lib/helpers/edit_on_gitlab.rb4
14 files changed, 57 insertions, 57 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ce991a2..9b2db2a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -172,7 +172,7 @@ review:
paths:
- environment_url.txt
only:
- - branches@gitlab-com/gitlab-docs
+ - branches@gitlab-org/gitlab-docs
# Except master and stable branches
except:
- master
@@ -201,7 +201,7 @@ review_stop:
name: review/$CI_COMMIT_REF_SLUG
action: stop
only:
- - branches@gitlab-com/gitlab-docs
+ - branches@gitlab-org/gitlab-docs
# Except master and stable branches
except:
- master
@@ -220,7 +220,7 @@ review_stop:
# Deploy to production with GitLab Pages
#
pages:
- image: registry.gitlab.com/gitlab-com/gitlab-docs:latest
+ image: registry.gitlab.com/gitlab-org/gitlab-docs:latest
stage: deploy
variables:
GIT_STRATEGY: none
@@ -250,7 +250,7 @@ pages:
- environment_url.txt
expire_in: 1d
only:
- - master@gitlab-com/gitlab-docs
+ - master@gitlab-org/gitlab-docs
<<: *retry
###############################################
diff --git a/.gitlab/merge_request_templates/Release.md b/.gitlab/merge_request_templates/Release.md
index 82259b33..4052aa72 100644
--- a/.gitlab/merge_request_templates/Release.md
+++ b/.gitlab/merge_request_templates/Release.md
@@ -1,4 +1,4 @@
-[> How to](https://gitlab.com/gitlab-com/gitlab-docs/blob/master/dockerfiles/README.md)
+[> How to](https://gitlab.com/gitlab-org/gitlab-docs/blob/master/dockerfiles/README.md)
## During release
@@ -24,6 +24,6 @@ On the 22nd, a few minutes before merging this and **before the scheduled pipeli
## After merge
-1. [ ] Manually run the [scheduled pipeline](https://gitlab.com/gitlab-com/gitlab-docs/pipeline_schedules).
+1. [ ] Manually run the [scheduled pipeline](https://gitlab.com/gitlab-org/gitlab-docs/pipeline_schedules).
/label ~release
diff --git a/Dockerfile.master b/Dockerfile.master
index dc0b3516..872f82ed 100644
--- a/Dockerfile.master
+++ b/Dockerfile.master
@@ -1,5 +1,5 @@
# First use the bootstrap image to build master
-FROM registry.gitlab.com/gitlab-com/gitlab-docs:bootstrap as builder
+FROM registry.gitlab.com/gitlab-org/gitlab-docs:bootstrap as builder
# Set up needed environment variables that are called with --build-arg when
# the Docker image is built (see .gitlab-ci.yml).
@@ -25,15 +25,15 @@ ENV TARGET=/usr/share/nginx/html
# Get the nginx config from the nginx-onbuild image
# This hardly ever changes so should usually be cached
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:nginx-onbuild /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
RUN rm -rf /usr/share/nginx/html/*
# Get all the archive static HTML and put it into place
# Copy the versions found in 'content/_data/versions.yaml' under online.
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:12.0 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.11 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.10 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.0 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.11 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.10 ${TARGET} ${TARGET}
# Get the built docs output from the previous build stage
# This ordering means all previous layers can come from cache unless an archive
diff --git a/README.md b/README.md
index f1bdfc84..5d0fe9e1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![build status](https://gitlab.com/gitlab-com/gitlab-docs/badges/master/build.svg)](https://gitlab.com/gitlab-com/gitlab-docs/commits/master)
+[![build status](https://gitlab.com/gitlab-org/gitlab-docs/badges/master/build.svg)](https://gitlab.com/gitlab-com/gitlab-docs/commits/master)
# GitLab Documentation
@@ -152,10 +152,10 @@ Then, it's time to clone the needed repositories.
```sh
## Using SSH (for members that have Developer access)
- git clone git@gitlab.com:gitlab-com/gitlab-docs.git
+ git clone git@gitlab.com:gitlab-org/gitlab-docs.git
## Using HTTPS (for external contributors)
- git clone https://gitlab.com/gitlab-com/gitlab-docs.git
+ git clone https://gitlab.com/gitlab-org/gitlab-docs.git
```
1. Then, clone the repositories you wish to contribute changes to the documentation.
@@ -392,7 +392,7 @@ reports.
[job]: https://gitlab.com/gitlab-org/gitlab-ce/blob/2c00d00ec1c39dbea0e0e54265027b5476b78e3c/.gitlab-ci.yml#L308-318
[pages]: https://about.gitlab.com/features/pages/
-[environments page]: https://gitlab.com/gitlab-com/gitlab-docs/environments/folders/review
+[environments page]: https://gitlab.com/gitlab-org/gitlab-docs/environments/folders/review
[env-url-button]: https://docs.gitlab.com/ce/ci/environments.html#making-use-of-the-environment-url
-[pipelines page]: https://gitlab.com/gitlab-com/gitlab-docs/pipelines
-[new pipeline page]: https://gitlab.com/gitlab-com/gitlab-docs/pipelines/new
+[pipelines page]: https://gitlab.com/gitlab-org/gitlab-docs/pipelines
+[new pipeline page]: https://gitlab.com/gitlab-org/gitlab-docs/pipelines/new
diff --git a/content/archives/index.html b/content/archives/index.html
index 9df9cd4a..fe70b9a4 100644
--- a/content/archives/index.html
+++ b/content/archives/index.html
@@ -26,7 +26,7 @@ is built from the <code>doc</code> directories on the <code>master</code> branch
<a href="https://gitlab.com/gitlab-org/omnibus-gitlab/tree/master/doc">Omnibus GitLab</a>, and
<a href="https://gitlab.com/gitlab-org/gitlab-runner/tree/master/docs">GitLab Runner</a>,
all of them brought together by the
-<a href="https://gitlab.com/gitlab-com/gitlab-docs/">GitLab Docs</a>
+<a href="https://gitlab.com/gitlab-org/gitlab-docs/">GitLab Docs</a>
project, which continuously deploys this content to <a href="/">docs.gitlab.com</a>.
<h2 id="latest-released-version">Latest released version <a class="anchor" href="#latest-released-version"></a></h2>
@@ -61,7 +61,7 @@ to access them.
<h3><%= version %></h3>
-<div class="highlight"><pre class="highlight shell"><code>docker run <span class="nt">-it</span> <span class="nt">--rm</span> <span class="nt">-p</span> 4000:4000 registry.gitlab.com/gitlab-com/gitlab-docs:<%= version %>
+<div class="highlight"><pre class="highlight shell"><code>docker run <span class="nt">-it</span> <span class="nt">--rm</span> <span class="nt">-p</span> 4000:4000 registry.gitlab.com/gitlab-org/gitlab-docs:<%= version %>
</code></pre></div>
<% end %>
diff --git a/content/assets/stylesheets/stylesheet.scss b/content/assets/stylesheets/stylesheet.scss
index 75890156..30c43b3c 100644
--- a/content/assets/stylesheets/stylesheet.scss
+++ b/content/assets/stylesheets/stylesheet.scss
@@ -1356,7 +1356,7 @@ a.global-nav-link, .nav-link {
}
-// https://gitlab.com/gitlab-com/gitlab-docs/issues/107#note_36655246
+// https://gitlab.com/gitlab-org/gitlab-docs/issues/107#note_36655246
h1, h2, h3, h4, h5, h6 {
&[id]::before {
display: block;
@@ -1527,7 +1527,7 @@ li {
//
.algolia-autocomplete {
// Scrollable search results box
- // https://gitlab.com/gitlab-com/gitlab-docs/issues/362
+ // https://gitlab.com/gitlab-org/gitlab-docs/issues/362
.ds-dropdown-menu [class^=ds-dataset-] {
max-height: 85vh;
overflow-x: hidden;
diff --git a/dockerfiles/Dockerfile.archives b/dockerfiles/Dockerfile.archives
index 8f90be9d..34e0a017 100644
--- a/dockerfiles/Dockerfile.archives
+++ b/dockerfiles/Dockerfile.archives
@@ -4,28 +4,28 @@ ENV TARGET=/usr/share/nginx/html
# Get the nginx config from the nginx-onbuild image
# This hardly ever changes so should usually be cached
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:nginx-onbuild /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
# Get all the archive static HTML and put it into place
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:12.0 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.11 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.10 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.9 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.8 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.7 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.6 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.5 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.4 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.3 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.2 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.1 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.0 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.8 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.7 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.6 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.5 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.4 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.3 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.0 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.11 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.10 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.9 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.8 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.7 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.6 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.5 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.4 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.3 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.2 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.1 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.0 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.8 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.7 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.6 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.5 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.4 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.3 ${TARGET} ${TARGET}
# Serve the site (target), which is now all static HTML
CMD echo -e "GitLab docs are viewable at:\nhttp://0.0.0.0:4000"; exec nginx -g 'daemon off;'
diff --git a/dockerfiles/Dockerfile.builder.onbuild b/dockerfiles/Dockerfile.builder.onbuild
index 30934883..418d4c29 100644
--- a/dockerfiles/Dockerfile.builder.onbuild
+++ b/dockerfiles/Dockerfile.builder.onbuild
@@ -1,5 +1,5 @@
# Get Nanoc bootstrap
-FROM registry.gitlab.com/gitlab-com/gitlab-docs:bootstrap
+FROM registry.gitlab.com/gitlab-org/gitlab-docs:bootstrap
# Make the variables of the archive Dockerfiles accessible to this build-stage
ONBUILD ARG VER
diff --git a/dockerfiles/Dockerfile.gitlab-docs-lint b/dockerfiles/Dockerfile.gitlab-docs-lint
index 376d08ac..6e4edfca 100644
--- a/dockerfiles/Dockerfile.gitlab-docs-lint
+++ b/dockerfiles/Dockerfile.gitlab-docs-lint
@@ -11,7 +11,7 @@ RUN apk update && apk upgrade && apk add --no-cache \
RUN yarn global add markdownlint-cli && yarn cache clean
-RUN wget https://gitlab.com/gitlab-com/gitlab-docs/-/archive/$CI_COMMIT_REF_NAME/gitlab-docs-$CI_COMMIT_REF_NAME.tar.bz2 \
+RUN wget https://gitlab.com/gitlab-org/gitlab-docs/-/archive/$CI_COMMIT_REF_NAME/gitlab-docs-$CI_COMMIT_REF_NAME.tar.bz2 \
&& tar xvjf gitlab-docs-$CI_COMMIT_REF_NAME.tar.bz2 \
&& mv gitlab-docs-$CI_COMMIT_REF_NAME gitlab-docs \
&& rm gitlab-docs-$CI_COMMIT_REF_NAME.tar.bz2
diff --git a/dockerfiles/Dockerfile.single b/dockerfiles/Dockerfile.single
index 2a6a635b..a30cb445 100644
--- a/dockerfiles/Dockerfile.single
+++ b/dockerfiles/Dockerfile.single
@@ -13,11 +13,11 @@ ARG BRANCH_RUNNER=X-Y-stable
ARG BRANCH_CHARTS=W-Z-stable
# This image comes from the Dockerfile.builder.onbuild file
-# https://gitlab.com/gitlab-com/gitlab-docs/blob/master/dockerfiles/Dockerfile.builder.onbuild
+# https://gitlab.com/gitlab-org/gitlab-docs/blob/master/dockerfiles/Dockerfile.builder.onbuild
# Build the website
-FROM registry.gitlab.com/gitlab-com/gitlab-docs:builder-onbuild AS builder
+FROM registry.gitlab.com/gitlab-org/gitlab-docs:builder-onbuild AS builder
# This image comes from the Dockerfile.nginx.onbuild file
-# https://gitlab.com/gitlab-com/gitlab-docs/blob/master/dockerfiles/Dockerfile.nginx.onbuild
+# https://gitlab.com/gitlab-org/gitlab-docs/blob/master/dockerfiles/Dockerfile.nginx.onbuild
# Copy the generated HTML files to a smaller image
-FROM registry.gitlab.com/gitlab-com/gitlab-docs:nginx-onbuild
+FROM registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild
diff --git a/dockerfiles/README.md b/dockerfiles/README.md
index ca3fe52f..7100e8c3 100644
--- a/dockerfiles/README.md
+++ b/dockerfiles/README.md
@@ -32,9 +32,9 @@ The following Dockerfiles are used.
You can build and tag all tooling images locally (while in this directory):
```sh
-docker build -t registry.gitlab.com/gitlab-com/gitlab-docs:bootstrap -f Dockerfile.bootstrap ../
-docker build -t registry.gitlab.com/gitlab-com/gitlab-docs:builder-onbuild -f Dockerfile.builder.onbuild ../
-docker build -t registry.gitlab.com/gitlab-com/gitlab-docs:nginx-onbuild -f Dockerfile.nginx.onbuild ../
+docker build -t registry.gitlab.com/gitlab-org/gitlab-docs:bootstrap -f Dockerfile.bootstrap ../
+docker build -t registry.gitlab.com/gitlab-org/gitlab-docs:builder-onbuild -f Dockerfile.builder.onbuild ../
+docker build -t registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild -f Dockerfile.nginx.onbuild ../
```
For each image, there's a manual job under the `images` stage in
@@ -91,7 +91,7 @@ Docker images:
1. [`Dockerfile.master`](../Dockerfile.master) - Rotate the versions (oldest
gets removed and latest is added at the end of the list).
-Once you push, you may need to [run the scheduled pipeline](https://gitlab.com/gitlab-com/gitlab-docs/pipeline_schedules)
+Once you push, you may need to [run the scheduled pipeline](https://gitlab.com/gitlab-org/gitlab-docs/pipeline_schedules)
(press the play button), since both of those images are built on a schedule,
once an hour.
@@ -119,7 +119,7 @@ page work as expected. If not, the `latest` image is possibly not yet updated.
### 5. Add the new offline version in the 404 page redirect script
Since we're deprecating the oldest version each month, we need to redirect
-those URLs in order not to create [404 entries](https://gitlab.com/gitlab-com/gitlab-docs/issues/221).
+those URLs in order not to create [404 entries](https://gitlab.com/gitlab-org/gitlab-docs/issues/221).
There's a temporary hack for now:
1. Edit [`content/404.html`](../content/404.html)
@@ -129,7 +129,7 @@ There's a temporary hack for now:
## Update an old image with new upstream content
If there are upstream changes not included in the single Docker image, just
-[rerun the pipeline](https://gitlab.com/gitlab-com/gitlab-docs/pipelines/new)
+[rerun the pipeline](https://gitlab.com/gitlab-org/gitlab-docs/pipelines/new)
for the branch in question.
## Porting new website changes to old versions
diff --git a/layouts/canonical_urls.html b/layouts/canonical_urls.html
index 8a3af5d8..1b73967b 100644
--- a/layouts/canonical_urls.html
+++ b/layouts/canonical_urls.html
@@ -1,6 +1,6 @@
<% if false %>
This is a comment!
-Implement canonical links https://gitlab.com/gitlab-com/gitlab-docs/issues/167
+Implement canonical links https://gitlab.com/gitlab-org/gitlab-docs/issues/167
We want to:
- All index.html and README.html files stripped
- Replace ce/ with ee/
diff --git a/layouts/footer.html b/layouts/footer.html
index 17b83fe2..648a99e4 100644
--- a/layouts/footer.html
+++ b/layouts/footer.html
@@ -2,7 +2,7 @@
<%= render '/footer_links.*' %>
</footer>
<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/product/pages/' target='_blank'>GitLab Pages</a>
+ <a href='https://gitlab.com/gitlab-org/gitlab-docs' target='_blank'>Created</a> with Nanoc, hosted on <a href='https://about.gitlab.com/product/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' %>
diff --git a/lib/helpers/edit_on_gitlab.rb b/lib/helpers/edit_on_gitlab.rb
index 97fe1b51..e1849225 100644
--- a/lib/helpers/edit_on_gitlab.rb
+++ b/lib/helpers/edit_on_gitlab.rb
@@ -36,8 +36,8 @@ module Nanoc::Helpers
gitlab_ide_url = "https://gitlab.com/-/ide/project/debugging/#{product}/edit/master/-/content/#{docs_content_filename}"
else
# gitlab-docs pages
- gitlab_url = "https://gitlab.com/gitlab-com/gitlab-docs/blob/master/#{@item[:content_filename]}"
- gitlab_ide_url = "https://gitlab.com/-/ide/project/gitlab-com/gitlab-docs/edit/master/-/#{@item[:content_filename]}"
+ gitlab_url = "https://gitlab.com/gitlab-org/gitlab-docs/blob/master/#{@item[:content_filename]}"
+ gitlab_ide_url = "https://gitlab.com/-/ide/project/gitlab-org/gitlab-docs/edit/master/-/#{@item[:content_filename]}"
end
case editor
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 12:47:27 +0300