Commit 884390de20532fc78dd1b78efafe9a5acc534c6d

Authored by Dmitriy Zaporozhets
2 parents 363a8ca0 6c475143

Merge pull request #6711 from marciotoze/patch-1

Update installation.md
Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
doc/install/installation.md
@@ -179,7 +179,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da @@ -179,7 +179,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
179 cd /home/git/gitlab 179 cd /home/git/gitlab
180 180
181 **Note:** 181 **Note:**
182 -You can change `6-6-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! 182 +You can change `6-7-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
183 183
184 ## Configure it 184 ## Configure it
185 185
@@ -420,9 +420,9 @@ These steps are fairly general and you will need to figure out the exact details @@ -420,9 +420,9 @@ These steps are fairly general and you will need to figure out the exact details
420 * Stop GitLab 420 * Stop GitLab
421 `sudo service gitlab stop` 421 `sudo service gitlab stop`
422 422
423 -* 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) 423 +* 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)
424 424
425 -* Add the gem to your [Gemfile](https://gitlab.com/gitlab-org/gitlab-ce/blob/masterGemfile) 425 +* Add the gem to your [Gemfile](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/Gemfile)
426 `gem "omniauth-your-auth-provider"` 426 `gem "omniauth-your-auth-provider"`
427 * If you're using MySQL, install the new Omniauth provider gem by running the following command: 427 * If you're using MySQL, install the new Omniauth provider gem by running the following command:
428 `sudo -u git -H bundle install --without development test postgres --path vendor/bundle --no-deployment` 428 `sudo -u git -H bundle install --without development test postgres --path vendor/bundle --no-deployment`