Commit 7ae488ede385b8cc4b01915c40dd54a520b1bf56
Exists in
spb-stable
and in
3 other branches
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Showing
5 changed files
with
13 additions
and
9 deletions
Show diff stats
doc/install/installation.md
| ... | ... | @@ -197,21 +197,18 @@ You can change `6-6-stable` to `master` if you want the *bleeding edge* version, |
| 197 | 197 | # Make sure GitLab can write to the log/ and tmp/ directories |
| 198 | 198 | sudo chown -R git log/ |
| 199 | 199 | sudo chown -R git tmp/ |
| 200 | - sudo chmod -R u+rwX log/ | |
| 201 | - sudo chmod -R u+rwX tmp/ | |
| 200 | + sudo chmod -R u+rwX log/ | |
| 201 | + sudo chmod -R u+rwX tmp/ | |
| 202 | 202 | |
| 203 | 203 | # Create directory for satellites |
| 204 | 204 | sudo -u git -H mkdir /home/git/gitlab-satellites |
| 205 | 205 | sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites |
| 206 | 206 | |
| 207 | - # Create directories for sockets/pids and make sure GitLab can write to them | |
| 208 | - sudo -u git -H mkdir tmp/pids/ | |
| 209 | - sudo -u git -H mkdir tmp/sockets/ | |
| 210 | - sudo chmod -R u+rwX tmp/pids/ | |
| 211 | - sudo chmod -R u+rwX tmp/sockets/ | |
| 207 | + # Make sure GitLab can write to the tmp/pids/ and tmp/sockets/ directories | |
| 208 | + sudo chmod -R u+rwX tmp/pids/ | |
| 209 | + sudo chmod -R u+rwX tmp/sockets/ | |
| 212 | 210 | |
| 213 | - # Create public/uploads directory otherwise backup will fail | |
| 214 | - sudo -u git -H mkdir public/uploads | |
| 211 | + # Make sure GitLab can write to the public/uploads/ directory | |
| 215 | 212 | sudo chmod -R u+rwX public/uploads |
| 216 | 213 | |
| 217 | 214 | # Copy the example Unicorn config |
| ... | ... | @@ -254,6 +251,13 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. |
| 254 | 251 | |
| 255 | 252 | ## Install Gems |
| 256 | 253 | |
| 254 | +**Note:** As of bundler 1.5.2, you can invoke `bundle install -jN` | |
| 255 | +(where `N` the number of your processor cores) and enjoy the parallel gems installation with measurable | |
| 256 | +difference in completion time (~60% faster). Check the number of your cores with `nproc`. | |
| 257 | +For more information check this [post](http://robots.thoughtbot.com/parallel-gem-installing-using-bundler). | |
| 258 | +First make sure you have bundler >= 1.5.2 (run `bundle -v`) as it addresses some [issues](https://devcenter.heroku.com/changelog-items/411) | |
| 259 | +that were [fixed](https://github.com/bundler/bundler/pull/2817) in 1.5.2. | |
| 260 | + | |
| 257 | 261 | cd /home/git/gitlab |
| 258 | 262 | |
| 259 | 263 | # For PostgreSQL (note, the option says "without ... mysql") | ... | ... |
11.7 KB