Commit 6654db2c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Replace 5-1-stable with 5-2-stable in installation docs

parent 6956c797
...@@ -137,10 +137,10 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install ...@@ -137,10 +137,10 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
cd /home/git/gitlab cd /home/git/gitlab
# Checkout to stable release # Checkout to stable release
sudo -u git -H git checkout 5-1-stable sudo -u git -H git checkout 5-2-stable
**Note:** **Note:**
You can change `5-1-stable` to `master` if you want the *bleeding edge* version, but You can change `5-2-stable` to `master` if you want the *bleeding edge* version, but
do so with caution! do so with caution!
## Configure it ## Configure it
...@@ -216,7 +216,7 @@ Make sure to update username/password in config/database.yml. ...@@ -216,7 +216,7 @@ Make sure to update username/password in config/database.yml.
Download the init script (will be /etc/init.d/gitlab): Download the init script (will be /etc/init.d/gitlab):
sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/master/lib/support/init.d/gitlab sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/5-2-stable/lib/support/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab sudo chmod +x /etc/init.d/gitlab
Make GitLab start on boot: Make GitLab start on boot:
...@@ -257,7 +257,7 @@ If you can't or don't want to use Nginx as your web server, have a look at the ...@@ -257,7 +257,7 @@ If you can't or don't want to use Nginx as your web server, have a look at the
Download an example site config: Download an example site config:
sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlabhq/master/lib/support/nginx/gitlab sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlabhq/5-2-stable/lib/support/nginx/gitlab
sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab
Make sure to edit the config file to match your setup: Make sure to edit the config file to match your setup:
...@@ -326,10 +326,10 @@ GitLab uses [Omniauth](http://www.omniauth.org/) for authentication and already ...@@ -326,10 +326,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/master/Gemfile#L18) * Add `gem "omniauth-your-auth-provider"` to the [Gemfile](https://github.com/gitlabhq/gitlabhq/blob/5-2-stable/Gemfile#L18)
* 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/master/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-2-stable/config/gitlab.yml.example#L53) as a reference)
* Add icons for the new provider into the [vendor/assets/images/authbuttons](https://github.com/gitlabhq/gitlabhq/tree/master/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-2-stable/vendor/assets/images/authbuttons) directory (you can find some more popular ones over at https://github.com/intridea/authbuttons)
* Restart GitLab * Restart GitLab
### Examples ### Examples
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment