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

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-10 14:13:13 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-10 14:13:13 +0300
commit82a3f2f109f957b8f6a5be84dd0f6e0170cecd4f (patch)
treeb65a23a752fc194ca176fc2284c592108960b81c
parentfdbaffdc08219e7bcd2dade5b70f90cd546841e2 (diff)
parent14b7a8b886b90afba29fc67a7d28ba7aaf3c0163 (diff)
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
-rw-r--r--README.md2
-rw-r--r--docker/README.md7
2 files changed, 3 insertions, 6 deletions
diff --git a/README.md b/README.md
index 2e2028c97f6..7dc0ffb30ee 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ To use EE and get official support please [become a subscriber](https://about.gi
## Code status
-- [![build status](https://ci.gitlab.org/projects/1/status.png?ref=master)](https://ci.gitlab.org/projects/1?ref=master) on ci.gitlab.org (master branch)
+- [![build status](https://ci.gitlab.com/projects/1/status.png?ref=master)](https://ci.gitlab.com/projects/1?ref=master) on ci.gitlab.com (master branch)
- [![Build Status](https://semaphoreapp.com/api/v1/projects/2f1a5809-418b-4cc2-a1f4-819607579fe7/243338/badge.png)](https://semaphoreapp.com/gitlabhq/gitlabhq)
diff --git a/docker/README.md b/docker/README.md
index 9cd48bf87d4..8df603eca4f 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,9 +1,6 @@
# GitLab Docker images
-## What is GitLab?
-
-GitLab offers git repository management, code reviews, issue tracking, activity feeds, wikis. It has LDAP/AD integration, handles 25,000 users on a single server but can also run on a highly available active/active cluster.
-Learn more on [https://about.gitlab.com](https://about.gitlab.com)
+The GitLab docker image is [available on Docker Hub](https://registry.hub.docker.com/u/gitlab/gitlab-ce/).
## After starting a container
@@ -165,4 +162,4 @@ sudo docker push gitlab/gitlab-ce:latest
## Troubleshooting
-Please see the [troubleshooting](troubleshooting.md) file in this directory.
+Please see the [troubleshooting](troubleshooting.md) file in this directory. \ No newline at end of file