Merge branch 'master' of github.com:gitlabhq/gitlabhq
This commit is contained in:
commit
7ae488ede3
|
@ -204,14 +204,11 @@ You can change `6-6-stable` to `master` if you want the *bleeding edge* version,
|
||||||
sudo -u git -H mkdir /home/git/gitlab-satellites
|
sudo -u git -H mkdir /home/git/gitlab-satellites
|
||||||
sudo chmod u+rwx,g+rx,o-rwx /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
|
# Make sure GitLab can write to the tmp/pids/ and tmp/sockets/ directories
|
||||||
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/pids/
|
||||||
sudo chmod -R u+rwX tmp/sockets/
|
sudo chmod -R u+rwX tmp/sockets/
|
||||||
|
|
||||||
# Create public/uploads directory otherwise backup will fail
|
# Make sure GitLab can write to the public/uploads/ directory
|
||||||
sudo -u git -H mkdir public/uploads
|
|
||||||
sudo chmod -R u+rwX public/uploads
|
sudo chmod -R u+rwX public/uploads
|
||||||
|
|
||||||
# Copy the example Unicorn config
|
# 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
|
## 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
|
cd /home/git/gitlab
|
||||||
|
|
||||||
# For PostgreSQL (note, the option says "without ... mysql")
|
# For PostgreSQL (note, the option says "without ... mysql")
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 12 KiB |
Loading…
Reference in New Issue