diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-14 22:11:47 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-14 22:11:47 +0300 |
| commit | 6be82c5e3b65bccc5b951628de34ebe94e06fdec (patch) | |
| tree | 90b6ead4c7503df3ccb96c32b04f70752b50ede6 /doc/install | |
| parent | 448e5c133a3c0b475ad28f4483d70cf65db73b76 (diff) | |
| parent | 17befe2a2aa53540548c7cf547022b59e7893199 (diff) | |
| download | gitlab-ce-6be82c5e3b65bccc5b951628de34ebe94e06fdec.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'doc/install')
| -rw-r--r-- | doc/install/installation.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index 1c7a02cecec..e2b37b0788a 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -179,7 +179,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da cd /home/git/gitlab **Note:** -You can change `6-6-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! +You can change `6-7-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! ## Configure it @@ -421,9 +421,9 @@ These steps are fairly general and you will need to figure out the exact details * Stop GitLab `sudo service gitlab stop` -* Add provider specific configuration options to your `config/gitlab.yml` (you can use the [auth providers section of the example config](https://gitlab.com/gitlab-org/gitlab-ce/blob/masterconfig/gitlab.yml.example) as a reference) +* Add provider specific configuration options to your `config/gitlab.yml` (you can use the [auth providers section of the example config](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example) as a reference) -* Add the gem to your [Gemfile](https://gitlab.com/gitlab-org/gitlab-ce/blob/masterGemfile) +* Add the gem to your [Gemfile](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/Gemfile) `gem "omniauth-your-auth-provider"` * If you're using MySQL, install the new Omniauth provider gem by running the following command: `sudo -u git -H bundle install --without development test postgres --path vendor/bundle --no-deployment` |