diff --git a/doc/install/installation.md b/doc/install/installation.md index bc194d33927..e1fa822f7d6 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -197,21 +197,18 @@ You can change `6-6-stable` to `master` if you want the *bleeding edge* version, # Make sure GitLab can write to the log/ and tmp/ directories sudo chown -R git log/ sudo chown -R git tmp/ - sudo chmod -R u+rwX log/ - sudo chmod -R u+rwX tmp/ + sudo chmod -R u+rwX log/ + sudo chmod -R u+rwX tmp/ # Create directory for satellites sudo -u git -H mkdir /home/git/gitlab-satellites sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites - # Create directories for sockets/pids and make sure GitLab can write to them - sudo -u git -H mkdir tmp/pids/ - sudo -u git -H mkdir tmp/sockets/ - sudo chmod -R u+rwX tmp/pids/ - sudo chmod -R u+rwX tmp/sockets/ + # Make sure GitLab can write to the tmp/pids/ and tmp/sockets/ directories + sudo chmod -R u+rwX tmp/pids/ + sudo chmod -R u+rwX tmp/sockets/ - # Create public/uploads directory otherwise backup will fail - sudo -u git -H mkdir public/uploads + # Make sure GitLab can write to the public/uploads/ directory sudo chmod -R u+rwX public/uploads # Copy the example Unicorn config @@ -254,6 +251,13 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. ## Install Gems +**Note:** As of bundler 1.5.2, you can invoke `bundle install -jN` +(where `N` the number of your processor cores) and enjoy the parallel gems installation with measurable +difference in completion time (~60% faster). Check the number of your cores with `nproc`. +For more information check this [post](http://robots.thoughtbot.com/parallel-gem-installing-using-bundler). +First make sure you have bundler >= 1.5.2 (run `bundle -v`) as it addresses some [issues](https://devcenter.heroku.com/changelog-items/411) +that were [fixed](https://github.com/bundler/bundler/pull/2817) in 1.5.2. + cd /home/git/gitlab # For PostgreSQL (note, the option says "without ... mysql") diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 00000000000..6f2e0dd090f Binary files /dev/null and b/public/apple-touch-icon.png differ diff --git a/public/uploads/.gitkeep b/public/uploads/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tmp/pids/.gitkeep b/tmp/pids/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tmp/sockets/.gitkeep b/tmp/sockets/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d