@@ -153,7 +153,7 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
...
@@ -153,7 +153,7 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
sudo -u git -H git checkout 5-4-stable
sudo -u git -H git checkout 5-4-stable
**Note:**
**Note:**
You can change `5-3-stable` to `master` if you want the *bleeding edge* version, but do so with caution!
You can change `5-4-stable` to `master` if you want the *bleeding edge* version, but do so with caution!
## Configure it
## Configure it
...
@@ -357,10 +357,10 @@ GitLab uses [Omniauth](http://www.omniauth.org/) for authentication and already
...
@@ -357,10 +357,10 @@ GitLab uses [Omniauth](http://www.omniauth.org/) for authentication and already
These steps are fairly general and you will need to figure out the exact details from the Omniauth provider's documentation.
These steps are fairly general and you will need to figure out the exact details from the Omniauth provider's documentation.
* Add `gem "omniauth-your-auth-provider"` to the [Gemfile](https://github.com/gitlabhq/gitlabhq/blob/5-3-stable/Gemfile#L18)
* Add `gem "omniauth-your-auth-provider"` to the [Gemfile](https://github.com/gitlabhq/gitlabhq/blob/5-4-stable/Gemfile#L19)
* Run `sudo -u git -H bundle install` to install the new gem(s)
* Run `sudo -u git -H bundle install` to install the new gem(s)
* Add provider specific configuration options to your `config/gitlab.yml` (you can use the [auth providers section of the example config](https://github.com/gitlabhq/gitlabhq/blob/5-3-stable/config/gitlab.yml.example#L53) 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://github.com/gitlabhq/gitlabhq/blob/5-4-stable/config/gitlab.yml.example#L113) as a reference)
* Add icons for the new provider into the [vendor/assets/images/authbuttons](https://github.com/gitlabhq/gitlabhq/tree/5-3-stable/vendor/assets/images/authbuttons) directory (you can find some more popular ones over at https://github.com/intridea/authbuttons)
* Add icons for the new provider into the [vendor/assets/images/authbuttons](https://github.com/gitlabhq/gitlabhq/tree/5-4-stable/vendor/assets/images/authbuttons) directory (you can find some more popular ones over at https://github.com/intridea/authbuttons)
