Commit graph

13 commits

Author SHA1 Message Date
GitLab Bot
21796f414c Add latest changes from gitlab-org/gitlab@master 2021-01-22 00:09:25 +00:00
GitLab Bot
f7ae5366cc Add latest changes from gitlab-org/gitlab@master 2021-01-18 21:11:05 +00:00
GitLab Bot
dcacb5daf7 Add latest changes from gitlab-org/gitlab@master 2021-01-11 18:10:43 +00:00
GitLab Bot
90859e80ca Add latest changes from gitlab-org/gitlab@master 2019-12-12 18:07:34 +00:00
GitLab Bot
535d167d40 Add latest changes from gitlab-org/gitlab@master 2019-10-04 06:06:05 +00:00
Dmitriy Zaporozhets
0abf225a2a Replace Unicorn with web server in the init.d script [ci skip]
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2019-05-17 17:00:29 +00:00
Sytse Sijbrandij
7c55c73d63 Fix confusing situation where install guide told you to install init.d script for puma. 2013-08-19 21:54:12 +02:00
Dmitriy Zaporozhets
6ace422c29 Merge branch 'master' into 6-0-dev
Conflicts:
	Gemfile
	Gemfile.lock
2013-07-08 09:50:10 +03:00
Dmitriy Zaporozhets
2882d16e7a cleanup puma config a bit 2013-07-08 07:55:16 +03:00
Jacob Vosmaer
ae9e4a52c5 Add cluster mode instructions to puma.rb.example 2013-07-04 11:14:03 +02:00
Lyle Entwistle
85e784cc1d Fixed puma.rb environment setting, no need to specify 'production' in daemon options now 2013-05-09 17:41:00 +01:00
Michael Härtl
28ef0fe751 Fixes #3793: Puma configuration for relative base URL 2013-05-08 08:09:23 +02:00
Dmitriy Zaporozhets
1fe61284af Replace unicorn with Puma 2013-04-04 23:19:24 +03:00