Download as
Browse Code »

Commit 148eade9d71ee9957633c4a5371857fdb0def605

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

Version to 5.3

Showing 3 changed files with 7 additions and 6 deletions   Show diff stats
@@ -24,6 +24,7 @@ v 5.3.0 @@ -24,6 +24,7 @@ v 5.3.0
24 - init.d: Ensure socket is removed before starting service 24 - init.d: Ensure socket is removed before starting service
25 - Admin area: Style teams:index, group:show pages 25 - Admin area: Style teams:index, group:show pages
26 - Own page for failed forking 26 - Own page for failed forking
  27 + - Scrum view for milestone
27 28
28 v 5.2.0 29 v 5.2.0
29 - Turbolinks 30 - Turbolinks
1 -5.3.0.beta1 1 +5.3.0
doc/install/installation.md
  Diff comments   View file @148eade
@@ -149,10 +149,10 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install @@ -149,10 +149,10 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
149 cd /home/git/gitlab 149 cd /home/git/gitlab
150 150
151 # Checkout to stable release 151 # Checkout to stable release
152 - sudo -u git -H git checkout 5-2-stable 152 + sudo -u git -H git checkout 5-3-stable
153 153
154 **Note:** 154 **Note:**
155 -You can change `5-2-stable` to `master` if you want the *bleeding edge* version, but 155 +You can change `5-3-stable` to `master` if you want the *bleeding edge* version, but
156 do so with caution! 156 do so with caution!
157 157
158 ## Configure it 158 ## Configure it
@@ -344,10 +344,10 @@ GitLab uses [Omniauth](http://www.omniauth.org/) for authentication and already @@ -344,10 +344,10 @@ GitLab uses [Omniauth](http://www.omniauth.org/) for authentication and already
344 344
345 These steps are fairly general and you will need to figure out the exact details from the Omniauth provider's documentation. 345 These steps are fairly general and you will need to figure out the exact details from the Omniauth provider's documentation.
346 346
347 -* Add `gem "omniauth-your-auth-provider"` to the [Gemfile](https://github.com/gitlabhq/gitlabhq/blob/5-2-stable/Gemfile#L18) 347 +* Add `gem "omniauth-your-auth-provider"` to the [Gemfile](https://github.com/gitlabhq/gitlabhq/blob/5-3-stable/Gemfile#L18)
348 * Run `sudo -u git -H bundle install` to install the new gem(s) 348 * Run `sudo -u git -H bundle install` to install the new gem(s)
349 -* 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)  
350 -* 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) 349 +* 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)
  350 +* 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)
351 * Restart GitLab 351 * Restart GitLab
352 352
353 ### Examples 353 ### Examples