summaryrefslogtreecommitdiff
path: root/doc/install
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-14 12:38:42 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-14 12:38:42 +0300
commit884390de20532fc78dd1b78efafe9a5acc534c6d (patch)
tree6000dab7dafff510646b506270f0e4f7e5e9d2f7 /doc/install
parent363a8ca02f4ff7e5d354ccfeb0d5dbed76e587dc (diff)
parent6c47514322e7e1e395869ff81af32eb71b074301 (diff)
downloadgitlab-ce-884390de20532fc78dd1b78efafe9a5acc534c6d.tar.gz
Merge pull request #6711 from marciotoze/patch-1
Update installation.md
Diffstat (limited to 'doc/install')
-rw-r--r--doc/install/installation.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 0c99ef81815..6707718228e 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
@@ -420,9 +420,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`