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:
authorAchilleas Pipinellis <axil@gitlab.com>2019-07-12 14:47:52 +0300
committerAchilleas Pipinellis <axil@gitlab.com>2019-07-12 14:47:52 +0300
commit620c1b56392ef92afa97240c48bd1efa837b2708 (patch)
tree0c5be24544863d7fbd1758b2d71e93262659ca3d
parent2e6e1d5bca868335a325229a4a9865af1914582c (diff)
Change project group to 'gitlab-org'
-rw-r--r--.gitlab-ci.yml8
-rw-r--r--.gitlab/merge_request_templates/Release.md4
-rw-r--r--Dockerfile.11.08
-rw-r--r--Dockerfile.master10
-rw-r--r--README.md12
-rw-r--r--content/archives.html2
-rw-r--r--content/assets/stylesheets/stylesheet.scss4
-rw-r--r--dockerfiles/Dockerfile.archives14
-rw-r--r--dockerfiles/Dockerfile.builder.onbuild2
-rw-r--r--dockerfiles/Dockerfile.single8
-rw-r--r--dockerfiles/README.md10
-rw-r--r--layouts/canonical_urls.html2
-rw-r--r--layouts/footer.html2
-rw-r--r--lib/helpers/edit_on_gitlab.rb2
-rw-r--r--lib/helpers/redcarpet_render.rb2
15 files changed, 45 insertions, 45 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71983295..c42f3939 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -158,7 +158,7 @@ review:
paths:
- environment_url.txt
only:
- - branches@gitlab-com/gitlab-docs
+ - branches@gitlab-org/gitlab-docs
# Except master and stable branches
except:
- master
@@ -186,7 +186,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
@@ -204,7 +204,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
@@ -234,7 +234,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 a5f98e2a..77621958 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)
- [ ] Make sure the proper milestone and ~release label are assigned to the MR
- [ ] Create and push a branch with the release name (that will create a Docker image with the stable version)
@@ -6,6 +6,6 @@
- [ ] Edit `Dockerfile.master` and rotate the versions
- [ ] Edit `dockerfiles/Dockerfile.archives` and add the new version
- [ ] \(Optional) Rerun the stable version pipeline if there are changes in the docs after the Docker image was created
-- [ ] Merge and manually run the [scheduled pipeline](https://gitlab.com/gitlab-com/gitlab-docs/pipeline_schedules).
+- [ ] Merge and manually run the [scheduled pipeline](https://gitlab.com/gitlab-org/gitlab-docs/pipeline_schedules).
/label ~release
diff --git a/Dockerfile.11.0 b/Dockerfile.11.0
index da5377f0..178a150d 100644
--- a/Dockerfile.11.0
+++ b/Dockerfile.11.0
@@ -12,11 +12,11 @@ ARG BRANCH_OMNIBUS=11-0-stable
ARG BRANCH_RUNNER=11-0-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/Dockerfile.master b/Dockerfile.master
index 900e654e..8ed2dcb3 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
# Build the docs from this branch
COPY . /source/
@@ -18,7 +18,7 @@ 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/*
@@ -26,9 +26,9 @@ RUN rm -rf /usr/share/nginx/html/*
# Go oldest-to-newest to take advantage of the fact that we change older
# archives less often than new ones. Copy the versions found in
# 'content/_data/versions.yaml' under current and previous.
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.6 ${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.8 ${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.7 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.8 ${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 f4815246..78a63117 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
@@ -159,10 +159,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.
@@ -334,7 +334,7 @@ By default, we pull from the master branch of [all the projects](#projects-we-pu
[job]: https://gitlab.com/gitlab-org/gitlab-ce/blob/2c00d00ec1c39dbea0e0e54265027b5476b78e3c/.gitlab-ci.yml#L308-318
[pages]: https://pages.gitlab.io
-[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.html b/content/archives.html
index e53aa14b..8cbf5864 100644
--- a/content/archives.html
+++ b/content/archives.html
@@ -41,7 +41,7 @@ The following archives are available and can be browsed offline. You'll need to
<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 eaae0e55..1cdf5719 100644
--- a/content/assets/stylesheets/stylesheet.scss
+++ b/content/assets/stylesheets/stylesheet.scss
@@ -962,7 +962,7 @@ li {
}
-// 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;
@@ -1112,7 +1112,7 @@ li {
}
}
-// https://gitlab.com/gitlab-com/gitlab-docs/issues/107#note_36655246
+// https://gitlab.com/gitlab-org/gitlab-docs/issues/107#note_36655246
*[id]:not(sup)::before {
display: block;
content: " ";
diff --git a/dockerfiles/Dockerfile.archives b/dockerfiles/Dockerfile.archives
index 6ecd47a8..d2572d72 100644
--- a/dockerfiles/Dockerfile.archives
+++ b/dockerfiles/Dockerfile.archives
@@ -4,17 +4,17 @@ 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
# Go oldest-to-newest to take advantage of the fact that we change older
# archives less often than new ones.
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.3 ${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.5 ${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.7 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.8 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.3 ${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.5 ${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.7 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.8 ${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 f768892b..bd3f383a 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.single b/dockerfiles/Dockerfile.single
index e2df882e..e94d361d 100644
--- a/dockerfiles/Dockerfile.single
+++ b/dockerfiles/Dockerfile.single
@@ -12,11 +12,11 @@ ARG BRANCH_OMNIBUS=X-Y-stable
ARG BRANCH_RUNNER=X-Y-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 f1961489..5a1164e2 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
@@ -90,7 +90,7 @@ There are 2 things to change:
1. [`Dockerfile.archives`](Dockerfile.archives)
1. [`Dockerfile.master`](../Dockerfile.master)
-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.
@@ -118,7 +118,7 @@ page work as expected. If not, the `latest` image is possibly not yet updated.
## 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 478da4cc..98de545b 100644
--- a/layouts/footer.html
+++ b/layouts/footer.html
@@ -1,7 +1,7 @@
<footer class=footer>
<%= render '/footer_links.*' %>
<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://gitlab.com/gitlab-org/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' %>
diff --git a/lib/helpers/edit_on_gitlab.rb b/lib/helpers/edit_on_gitlab.rb
index 9f7147ca..beb15c71 100644
--- a/lib/helpers/edit_on_gitlab.rb
+++ b/lib/helpers/edit_on_gitlab.rb
@@ -21,7 +21,7 @@ module Nanoc::Helpers
gitlab_url = "https://gitlab.com/gitlab-org/gitlab-#{product}/blob/master/doc/#{docs_content_filename}"
else
# gitlab-docs pages
- gitlab_url = "https://gitlab.com/gitlab-com/gitlab-docs/blob/master/#{@item[:content_filename]}"
+ gitlab_url = "https://gitlab.com/gitlab-org/gitlab-docs/blob/master/#{@item[:content_filename]}"
end
result = "<a href='#{gitlab_url}'>Edit this page</a>"
diff --git a/lib/helpers/redcarpet_render.rb b/lib/helpers/redcarpet_render.rb
index 86e2a07e..68b934e7 100644
--- a/lib/helpers/redcarpet_render.rb
+++ b/lib/helpers/redcarpet_render.rb
@@ -12,7 +12,7 @@ module Nanoc::Helpers
anchor = text.gsub(/\s+/, '-').gsub(/<\/?[^>]*>/, '').downcase
# https://github.com/rails/rails/blob/e491b2c06329afb3c989261a2865d2a93c8b84b8/activesupport/lib/active_support/inflector/transliterate.rb#L86
anchor.gsub!(/[^a-z0-9\-_]+/i, '-')
- anchor.gsub!(/39-/, '') # remove weird symbol https://gitlab.com/gitlab-com/gitlab-docs/issues/84
+ anchor.gsub!(/39-/, '') # remove weird symbol https://gitlab.com/gitlab-org/gitlab-docs/issues/84
anchor.squeeze!('-') # replace multiple dashes with one
anchor.gsub!(/^-|-$/, '') # remove any first or last dashes