Download as
Browse Code »

Commit 6654db2c82b1410a214b4fe1f2bd5ce620782cad

Authored by Dmitriy Zaporozhets
1 parent 6956c797
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 1 changed file with 7 additions and 7 deletions   Show diff stats
doc/install/installation.md
  Diff comments   View file @6654db2
... ... @@ -137,10 +137,10 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
137 137 cd /home/git/gitlab
138 138  
139 139 # Checkout to stable release
140   - sudo -u git -H git checkout 5-1-stable
  140 + sudo -u git -H git checkout 5-2-stable
141 141  
142 142 **Note:**
143   -You can change `5-1-stable` to `master` if you want the *bleeding edge* version, but
  143 +You can change `5-2-stable` to `master` if you want the *bleeding edge* version, but
144 144 do so with caution!
145 145  
146 146 ## Configure it
... ... @@ -216,7 +216,7 @@ Make sure to update username/password in config/database.yml.
216 216  
217 217 Download the init script (will be /etc/init.d/gitlab):
218 218  
219   - sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/master/lib/support/init.d/gitlab
  219 + sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/5-2-stable/lib/support/init.d/gitlab
220 220 sudo chmod +x /etc/init.d/gitlab
221 221  
222 222 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 257  
258 258 Download an example site config:
259 259  
260   - sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlabhq/master/lib/support/nginx/gitlab
  260 + sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlabhq/5-2-stable/lib/support/nginx/gitlab
261 261 sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab
262 262  
263 263 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 326  
327 327 These steps are fairly general and you will need to figure out the exact details from the Omniauth provider's documentation.
328 328  
329   -* Add `gem "omniauth-your-auth-provider"` to the [Gemfile](https://github.com/gitlabhq/gitlabhq/blob/master/Gemfile#L18)
  329 +* Add `gem "omniauth-your-auth-provider"` to the [Gemfile](https://github.com/gitlabhq/gitlabhq/blob/5-2-stable/Gemfile#L18)
330 330 * Run `sudo -u git -H bundle install` to install the new gem(s)
331   -* 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)
332   -* 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)
  331 +* 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)
  332 +* 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)
333 333 * Restart GitLab
334 334  
335 335 ### Examples
... ...