Commit Graph

10 Commits

Author SHA1 Message Date
GitLab Bot 91ed938e3d Add latest changes from gitlab-org/gitlab@master 2020-02-08 03:08:47 +00:00
GitLab Bot 535d167d40 Add latest changes from gitlab-org/gitlab@master 2019-10-04 06:06:05 +00:00
Jan Provaznik 606261e8e7 Run do_master_restart callback on server start
We want to call master_restart callback on start too - this callback
is used for cleaning up prometheus files. It has been added to
Omnibus already:
https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/3350

So make sure that Unicorn example configs are up-to-date and that
the same callback is called for Puma too.
2019-07-01 15:32:19 +00:00
Brett Walker 6c90aac014 Remove extra ending line from unicorn example file 2019-05-16 16:24:59 -05:00
Andrew Newdigate 1065f8ce7a Add experimental support for Puma
This allows us (and others) to test drive Puma without it affecting all
users. Puma can be enabled by setting the environment variable
"EXPERIMENTAL_PUMA" to a non empty value.
2018-10-25 17:50:15 +01:00
Brett Walker f480399334 Fix rubocop complaining about unicorn.rb 2018-10-12 14:08:13 -05:00
Lin Jen-Shin e315dca6ce Copy important changes from unicorn.rb.example to
unicorn.rb.example.development. Also remove unneeded configurations
and update the comment accordingly. I think REE was long dead.
2018-07-31 19:02:59 +08:00
Jacob Vosmaer (GitLab) d9927162a3 Prevent Unicorn crashing in development on macOS 2018-01-23 13:32:15 +00:00
Dmitriy Zaporozhets b083ab83ea Increase unicorn timeout to 60 seconds 2014-09-23 17:11:16 +03:00
Marin Jankovski 4df1a10e90 Update development steps. 2014-04-08 11:17:19 +02:00