Commit graph

18 commits

Author SHA1 Message Date
Crom (Thibaut CHARLES)
906c65b624 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq
Conflicts:
	config/application.rb
	config/gitlab.yml.example
	config/unicorn.rb.example
2013-12-09 13:22:22 +00:00
Sytse Sijbrandij
b8cb7df761 Add warning back. 2013-11-29 08:57:45 +01:00
Sytse Sijbrandij
22d3aa4e32 Unsupported is unclear. 2013-11-28 07:57:56 +01:00
Crom (Thibaut CHARLES)
87fc35073a Fixed comments for running gitlab in a non-root path
- If you don't edit gitlab-shell/config.yml, you wnon't be able to push via SSH (as described here: http://stackoverflow.com/questions/15746336/gitlab-cant-push-code-to-server)
- If you don't re-run sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production, some icons won't be visible
2013-11-06 10:14:48 +00:00
Thomas Misilo
b688bac9b6 Updated at the request of @f0k 2013-09-28 07:40:48 -04:00
Thomas Misilo
06903b0396 Added reference to the line "ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"" , as it talked about in the gitlab.yml.example 2013-09-27 08:39:38 -04:00
Spencer
53b75acf79 Update unicorn.rb.example 2013-09-13 19:07:05 -06:00
Dmitriy Zaporozhets
999c4888fd Merge pull request #4845 from mmoll/unicorn_localhost
bind unicorn listener to 127.0.0.1
2013-08-25 12:21:11 -07:00
Jacob Vosmaer
2b9d48ccd0 Fix the service gitlab restart command
This commit addresses two related issues:
- Sidekiq should shut down completely before we restart it;
- If we restart unicorn with USR2 we need to kill the old master and
  worker processes.
2013-08-23 10:31:32 +02:00
Michael Moll
b3e07ec334 bind unicorn listener to 127.0.0.1
otherwise it will listen on 0.0.0.0
2013-08-22 13:17:58 +02:00
Dmitriy Zaporozhets
967d42e0c8 Fix unicorn init and config 2013-07-08 19:28:59 +03:00
Dmitriy Zaporozhets
6f5f5e7ee3 Add suppoort of unicorn and fog gems 2013-07-08 09:47:31 +03:00
Dmitriy Zaporozhets
3ba36df6c4 remove unicorn config since we use puma now 2013-04-19 17:22:55 +03:00
Kevin Lyda
415bade302 Result of misspellings run.
Most of these are comments but a few are strings for users.

Might be an idea to run this from time to time:
https://github.com/lyda/misspell-check

It runs mostly clean now.
2013-03-17 19:46:54 +00:00
Mike Wyatt
5e28710692 remove hardcoded app_dir from unicorn.rb.example 2013-01-31 18:33:11 -03:30
Chris Frohoff
21e55ca318 added RAILS_RELATIVE_URL_ROOT support 2012-12-28 18:11:28 +00:00
Caley Woods
e3b149fae6 Update comment in example unicorn config
The timeout was changed to 30 and the comment wasn't updated. Also I've seen several reports of this timeout not being long enough for quite a few people. It resulted in me getting a 502 bad gateway from nginx until I upped it. Perhaps could back to the default 60 would be better? I changed mine to 300, running on an AWS micro instance.
2012-09-19 10:27:27 -05:00
Tobias Pfeiffer
74cfab692f Renamed unicorn.rb.orig to unicorn.rb.example since this seems to be more in line with the common used naming in the config directory. Plus seeing *.orig files I think of the leftovers of git merges, which left me puzzled for quite some time. 2012-09-15 20:26:08 +02:00
Renamed from config/unicorn.rb.orig (Browse further)