summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-16 09:06:40 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-16 09:06:40 +0000
commit9220e3ef18dfaa9fed0e016b667d1b8c862cc5df (patch)
tree06b624ca5ee5d43e3266476cb791d9393ff9f50e
parentf31f101d364ea51bb32a7ed0c8a66ccff7811a15 (diff)
parent89ed1e09bba6c0fe5d259510f2b91de730c9675d (diff)
downloadgitlab-ce-9220e3ef18dfaa9fed0e016b667d1b8c862cc5df.tar.gz
Merge branch 'consistent-readme' into 'master'
Consistent readme
-rw-r--r--README.md26
1 files changed, 18 insertions, 8 deletions
diff --git a/README.md b/README.md
index 166e1187bfd..152c3c0e2b9 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,11 @@
# GitLab
-## Self hosted Git management software
+## Open source software to collaborate on code
![logo](https://gitlab.com/gitlab-org/gitlab-ce/raw/master/public/gitlab_logo.png)
![animated-screenshots](https://gist.github.com/fnkr/2f9badd56bfe0ed04ee7/raw/4f48806fbae97f556c2f78d8c2d299c04500cb0d/compiled.gif)
-## Open source software to collaborate on code
-
- Manage Git repositories with fine grained access controls that keep your code secure
- Perform code reviews and enhance collaboration with merge requests
- Each project can also have an issue tracker and a wiki
@@ -29,15 +27,27 @@
- [![PullReview stats](https://www.pullreview.com/gitlab/gitlab-org/gitlab-ce/badges/master.svg?)](https://www.pullreview.com/gitlab.gitlab.com/gitlab-org/gitlab-ce/reviews/master)
-### Resources
+## Website
+
+On [www.gitlab.com](https://www.gitlab.com/) you can find more information about:
-- [www.gitlab.com](https://www.gitlab.com/) includes information about [subscriptions](https://www.gitlab.com/subscription/), [consultancy](https://www.gitlab.com/consultancy/), the [community](https://www.gitlab.com/community/) and the [hosted GitLab.com](https://www.gitlab.com/gitlab-com/).
+- [Subscriptions](https://www.gitlab.com/subscription/)
+- [Consultancy](https://www.gitlab.com/consultancy/)
+- [Community](https://www.gitlab.com/community/)
+- [Hosted GitLab.com](https://www.gitlab.com/gitlab-com/) use GitLab as a free service
+- [GitLab Enterprise Edition](https://www.gitlab.com/gitlab-ee/) with additional features aimed at larger organizations.
+- [GitLab CI](https://www.gitlab.com/gitlab-ci/) a continuous integration (CI) server that is easy to integrate with GitLab.
-- [GitLab Enterprise Edition](https://www.gitlab.com/gitlab-ee/) offers additional features aimed at larger organizations.
+## Third-party applications
-- [GitLab CI](https://www.gitlab.com/gitlab-ci/) is a continuous integration (CI) server that is easy to integrate with GitLab.
+Access GitLab from multiple platforms with applications below.
+These applications are maintained by contributors, GitLab B.V. does not offer support for them.
-- Unofficial third-party [iPhone app](http://gitlabcontrol.com/), [Android app](https://play.google.com/store/apps/details?id=com.bd.gitlab&hl=en), [command line client](https://github.com/drewblessing/gitlab-cli), [Ruby API wrapper](https://github.com/NARKOZ/gitlab) and [Chrome app](https://chrome.google.com/webstore/detail/chrome-gitlab-notifier/eageapgbnjicdjjihgclpclilenjbobi) for GitLab.
+- [iPhone app](http://gitlabcontrol.com/)
+- [Android app](https://play.google.com/store/apps/details?id=com.bd.gitlab&hl=en)
+- [Chrome app](https://chrome.google.com/webstore/detail/chrome-gitlab-notifier/eageapgbnjicdjjihgclpclilenjbobi)
+- [Command line client](https://github.com/drewblessing/gitlab-cli)
+- [Ruby API wrapper](https://github.com/NARKOZ/gitlab)
## Requirements