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:46:26 +0300
committerAchilleas Pipinellis <axil@gitlab.com>2019-07-12 14:46:26 +0300
commit5d3c724242bc3dcbf005afa5465597e104ca0b00 (patch)
tree27966e0a4daa7d5ee5986b005f8924b6de411df8
parent27cb4c38bcba66c736377724a8cc4cce445acccc (diff)
Change project group to 'gitlab-org'
-rw-r--r--.gitlab-ci.yml8
-rw-r--r--Dockerfile.10.68
-rw-r--r--Dockerfile.archive8
-rw-r--r--README.md12
-rw-r--r--content/archives/index.md10
-rw-r--r--content/assets/stylesheets/stylesheet.scss2
-rw-r--r--dockerfiles/Dockerfile.archives8
-rw-r--r--dockerfiles/Dockerfile.builder.onbuild2
-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
12 files changed, 37 insertions, 37 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/Dockerfile.10.6 b/Dockerfile.10.6
index 8bc13069..6cd2d8c0 100644
--- a/Dockerfile.10.6
+++ b/Dockerfile.10.6
@@ -12,9 +12,9 @@ ARG BRANCH_OMNIBUS=10-6-stable
ARG BRANCH_RUNNER=10-6-stable
# This image comes from the Dockerfile.builder.onbuild file
-# https://gitlab.com/gitlab-com/gitlab-docs/blob/master/dockerfiles/Dockerfile.builder.onbuild
-FROM registry.gitlab.com/gitlab-com/gitlab-docs:builder-onbuild AS builder
+# https://gitlab.com/gitlab-org/gitlab-docs/blob/master/dockerfiles/Dockerfile.builder.onbuild
+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
-FROM registry.gitlab.com/gitlab-com/gitlab-docs:nginx-onbuild
+# https://gitlab.com/gitlab-org/gitlab-docs/blob/master/dockerfiles/Dockerfile.nginx.onbuild
+FROM registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild
diff --git a/Dockerfile.archive b/Dockerfile.archive
index 843ebd54..57c761f4 100644
--- a/Dockerfile.archive
+++ b/Dockerfile.archive
@@ -12,9 +12,9 @@ ARG BRANCH_OMNIBUS=10-4-stable
ARG BRANCH_RUNNER=10-4-stable
# This image comes from the Dockerfile.builder.onbuild file
-# https://gitlab.com/gitlab-com/gitlab-docs/blob/master/dockerfiles/Dockerfile.builder.onbuild
-FROM registry.gitlab.com/gitlab-com/gitlab-docs:builder-onbuild AS builder
+# https://gitlab.com/gitlab-org/gitlab-docs/blob/master/dockerfiles/Dockerfile.builder.onbuild
+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
-FROM registry.gitlab.com/gitlab-com/gitlab-docs:nginx-onbuild
+# https://gitlab.com/gitlab-org/gitlab-docs/blob/master/dockerfiles/Dockerfile.nginx.onbuild
+FROM registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild
diff --git a/README.md b/README.md
index 88609682..145efe55 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
@@ -158,10 +158,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.
@@ -301,7 +301,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/index.md b/content/archives/index.md
index 9aabd9f3..c0ce679c 100644
--- a/content/archives/index.md
+++ b/content/archives/index.md
@@ -6,7 +6,7 @@ comments: false
CAUTION: **Warning:**
This page is in beta, many links might not work. For updates, follow
-[this issue](https://gitlab.com/gitlab-com/gitlab-docs/issues/16).
+[this issue](https://gitlab.com/gitlab-org/gitlab-docs/issues/16).
Browse the archives for different GitLab versions.
@@ -15,7 +15,7 @@ Browse the archives for different GitLab versions.
Visit the [GitLab 10.6 docs](/10.6/) or download them and browse locally:
```sh
-docker run -it --rm -p 4000:4000 registry.gitlab.com/gitlab-com/gitlab-docs:10.6
+docker run -it --rm -p 4000:4000 registry.gitlab.com/gitlab-org/gitlab-docs:10.6
```
## 10.5
@@ -23,7 +23,7 @@ docker run -it --rm -p 4000:4000 registry.gitlab.com/gitlab-com/gitlab-docs:10.6
Visit the [GitLab 10.5 docs](/10.5/) or download them and browse locally:
```sh
-docker run -it --rm -p 4000:4000 registry.gitlab.com/gitlab-com/gitlab-docs:10.5
+docker run -it --rm -p 4000:4000 registry.gitlab.com/gitlab-org/gitlab-docs:10.5
```
## 10.4
@@ -31,7 +31,7 @@ docker run -it --rm -p 4000:4000 registry.gitlab.com/gitlab-com/gitlab-docs:10.5
Visit the [GitLab 10.4 docs](/10.4/) or download them and browse locally:
```sh
-docker run -it --rm -p 4000:4000 registry.gitlab.com/gitlab-com/gitlab-docs:10.4
+docker run -it --rm -p 4000:4000 registry.gitlab.com/gitlab-org/gitlab-docs:10.4
```
## 10.3
@@ -39,5 +39,5 @@ docker run -it --rm -p 4000:4000 registry.gitlab.com/gitlab-com/gitlab-docs:10.4
Visit the [GitLab 10.3 docs](/10.3/) or download them and browse locally:
```sh
-docker run -it --rm -p 4000:4000 registry.gitlab.com/gitlab-com/gitlab-docs:10.3
+docker run -it --rm -p 4000:4000 registry.gitlab.com/gitlab-org/gitlab-docs:10.3
```
diff --git a/content/assets/stylesheets/stylesheet.scss b/content/assets/stylesheets/stylesheet.scss
index 2108f475..1c18c253 100644
--- a/content/assets/stylesheets/stylesheet.scss
+++ b/content/assets/stylesheets/stylesheet.scss
@@ -632,7 +632,7 @@ h6 {
}
}
-// 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 e824bca6..02484f84 100644
--- a/dockerfiles/Dockerfile.archives
+++ b/dockerfiles/Dockerfile.archives
@@ -4,14 +4,14 @@ 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-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}
# 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 ec2a9a6c..0dbb3874 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/README.md b/dockerfiles/README.md
index 1c0dbfab..fd4a93b0 100644
--- a/dockerfiles/README.md
+++ b/dockerfiles/README.md
@@ -18,9 +18,9 @@ The following Dockerfiles are used.
Build and tag all tooling images:
```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
@@ -56,8 +56,8 @@ branch:
ARG BRANCH_OMNIBUS=10-5-stable
ARG BRANCH_RUNNER=10-5-stable
- FROM registry.gitlab.com/gitlab-com/gitlab-docs:builder-onbuild AS builder
- FROM registry.gitlab.com/gitlab-com/gitlab-docs:nginx-onbuild
+ FROM registry.gitlab.com/gitlab-org/gitlab-docs:builder-onbuild AS builder
+ FROM registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild
```
1. Test locally by building the image and running it:
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 384a4393..c6626d4f 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>
<% 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/lib/helpers/edit_on_gitlab.rb b/lib/helpers/edit_on_gitlab.rb
index fbb1609c..541bd083 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}/edit/master/doc/#{docs_content_filename}"
else
# gitlab-docs pages
- gitlab_url = "https://gitlab.com/gitlab-com/gitlab-docs/edit/master/#{@item[:content_filename]}"
+ gitlab_url = "https://gitlab.com/gitlab-org/gitlab-docs/edit/master/#{@item[:content_filename]}"
end
result = "<a href='#{gitlab_url}'>Edit this page</a>"