Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
This commit is contained in:
commit
c4c41007ad
72
README.md
72
README.md
|
@ -1,9 +1,14 @@
|
||||||
|
# GitLab
|
||||||
|
|
||||||
|
[![build status](https://ci.gitlab.com/projects/1/status.png?ref=master)](https://ci.gitlab.com/projects/1?ref=master)
|
||||||
|
[![Build Status](https://semaphoreapp.com/api/v1/projects/2f1a5809-418b-4cc2-a1f4-819607579fe7/243338/badge.png)](https://semaphoreapp.com/gitlabhq/gitlabhq)
|
||||||
|
[![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
|
||||||
|
[![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.png?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq?branch=master)
|
||||||
|
|
||||||
## Canonical source
|
## Canonical source
|
||||||
|
|
||||||
The source of GitLab Community Edition is [hosted on GitLab.com](https://gitlab.com/gitlab-org/gitlab-ce/) and there are mirrors to make [contributing](CONTRIBUTING.md) as easy as possible.
|
The source of GitLab Community Edition is [hosted on GitLab.com](https://gitlab.com/gitlab-org/gitlab-ce/) and there are mirrors to make [contributing](CONTRIBUTING.md) as easy as possible.
|
||||||
|
|
||||||
# ![logo](https://about.gitlab.com/images/gitlab_logo.png) GitLab
|
|
||||||
|
|
||||||
## Open source software to collaborate on code
|
## Open source software to collaborate on code
|
||||||
|
|
||||||
To see how GitLab looks please see the [features page on our website](https://about.gitlab.com/features/).
|
To see how GitLab looks please see the [features page on our website](https://about.gitlab.com/features/).
|
||||||
|
@ -17,21 +22,12 @@ To see how GitLab looks please see the [features page on our website](https://ab
|
||||||
|
|
||||||
## Editions
|
## Editions
|
||||||
|
|
||||||
There are two editions of GitLab.
|
There are two editions of GitLab:
|
||||||
*GitLab [Community Edition](https://about.gitlab.com/features/) (CE)* is available without any costs under an MIT license.
|
|
||||||
|
|
||||||
*GitLab Enterprise Edition (EE)* includes [extra features](https://about.gitlab.com/features/#compare) that are most useful for organizations with more than 100 users.
|
- GitLab Community Edition (CE) is available freely under the MIT Expat license.
|
||||||
To use EE and get official support please [become a subscriber](https://about.gitlab.com/pricing/).
|
- GitLab Enterprise Edition (EE) includes [extra features](https://about.gitlab.com/features/#compare) that are more useful for organizations with more than 100 users. To use EE and get official support please [become a subscriber](https://about.gitlab.com/pricing/).
|
||||||
|
|
||||||
## Code status
|
Included with the GitLab Omnibus Packages is [GitLab CI](https://about.gitlab.com/gitlab-ci/) that can easily build, test and deploy code.
|
||||||
|
|
||||||
- [![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)
|
|
||||||
|
|
||||||
- [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
|
|
||||||
|
|
||||||
- [![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.png?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq?branch=master)
|
|
||||||
|
|
||||||
## Website
|
## Website
|
||||||
|
|
||||||
|
@ -46,7 +42,31 @@ On [about.gitlab.com](https://about.gitlab.com/) you can find more information a
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
GitLab requires the following software:
|
Please see the [requirements documentation](doc/install/requirements.md) for system requirements and more information about the supported operating systems.
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
The recommended way to install GitLab is with the [Omnibus packages](https://about.gitlab.com/downloads/) on our package server.
|
||||||
|
Compared to an installation from source, this is faster and less error prone.
|
||||||
|
Just select your operating system, download the respective package (Debian or RPM) and install it using the system's package manager.
|
||||||
|
|
||||||
|
There are various other options to install GitLab, please refer to the [installation page on the GitLab website](https://about.gitlab.com/installation/) for more information.
|
||||||
|
|
||||||
|
You can access a new installation with the login **`root`** and password **`5iveL!fe`**, after login you are required to set a unique password.
|
||||||
|
|
||||||
|
## Install a development environment
|
||||||
|
|
||||||
|
To work on GitLab itself, we recommend setting up your development environment with [the GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit).
|
||||||
|
If you do not use the GitLab Development Kit you need to install and setup all the dependencies yourself, this is a lot of work and error prone.
|
||||||
|
One small thing you also have to do when installing it yourself is to copy the example development unicorn configuration file:
|
||||||
|
|
||||||
|
cp config/unicorn.rb.example.development config/unicorn.rb
|
||||||
|
|
||||||
|
Instructions on how to start GitLab and how to run the tests can be found in the [development section of the GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit#development).
|
||||||
|
|
||||||
|
## Software stack
|
||||||
|
|
||||||
|
GitLab is a Ruby on Rails application that runs on the following software:
|
||||||
|
|
||||||
- Ubuntu/Debian/CentOS/RHEL
|
- Ubuntu/Debian/CentOS/RHEL
|
||||||
- Ruby (MRI) 2.0 or 2.1
|
- Ruby (MRI) 2.0 or 2.1
|
||||||
|
@ -54,15 +74,7 @@ GitLab requires the following software:
|
||||||
- Redis 2.0+
|
- Redis 2.0+
|
||||||
- MySQL or PostgreSQL
|
- MySQL or PostgreSQL
|
||||||
|
|
||||||
Please see the [requirements documentation](doc/install/requirements.md) for system requirements and more information about the supported operating systems.
|
For more information please see the [architecture documentation](http://doc.gitlab.com/ce/development/architecture.html).
|
||||||
|
|
||||||
## Installation
|
|
||||||
|
|
||||||
The recommended way to install GitLab is using the provided [Omnibus packages](https://about.gitlab.com/downloads/). Compared to an installation from source, this is faster and less error prone. Just select your operating system, download the respective package (Debian or RPM) and install it using the system's package manager.
|
|
||||||
|
|
||||||
There are various other options to install GitLab, please refer to the [installation page on the GitLab website](https://about.gitlab.com/installation/) for more information.
|
|
||||||
|
|
||||||
You can access a new installation with the login **`root`** and password **`5iveL!fe`**, after login you are required to set a unique password.
|
|
||||||
|
|
||||||
## Third-party applications
|
## Third-party applications
|
||||||
|
|
||||||
|
@ -76,16 +88,6 @@ Since 2011 a minor or major version of GitLab is released on the 22nd of every m
|
||||||
|
|
||||||
For upgrading information please see our [update page](https://about.gitlab.com/update/).
|
For upgrading information please see our [update page](https://about.gitlab.com/update/).
|
||||||
|
|
||||||
## Install a development environment
|
|
||||||
|
|
||||||
To work on GitLab itself, we recommend setting up your development environment with [the GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit).
|
|
||||||
If you do not use the GitLab Development Kit you need to install and setup all the dependencies yourself, this is a lot of work and error prone.
|
|
||||||
One small thing you also have to do when installing it yourself is to copy the example development unicorn configuration file:
|
|
||||||
|
|
||||||
cp config/unicorn.rb.example.development config/unicorn.rb
|
|
||||||
|
|
||||||
Instructions on how to start GitLab and how to run the tests can be found in the [development section of the GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit#development).
|
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
All documentation can be found on [doc.gitlab.com/ce/](http://doc.gitlab.com/ce/).
|
All documentation can be found on [doc.gitlab.com/ce/](http://doc.gitlab.com/ce/).
|
||||||
|
|
|
@ -165,3 +165,5 @@ sudo docker push gitlab/gitlab-ce:latest
|
||||||
Please see the [troubleshooting](troubleshooting.md) file in this directory.
|
Please see the [troubleshooting](troubleshooting.md) file in this directory.
|
||||||
|
|
||||||
Note: We use `fig.yml` to have compatibility with fig and because docker-compose also supports it.
|
Note: We use `fig.yml` to have compatibility with fig and because docker-compose also supports it.
|
||||||
|
|
||||||
|
Our docker image runs chef at every start to generate GitLab configuration.
|
||||||
|
|
Loading…
Reference in New Issue