diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-17 09:06:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-17 09:06:11 +0000 |
| commit | e567b4c2df7dc4085d213db029eff6b6fcde0152 (patch) | |
| tree | 801718b86d32bdd82a3cd90760e06a4d7a51b71d /lib | |
| parent | 42b933efc3384386c1991daca1a6d58160f70176 (diff) | |
| download | gitlab-ce-e567b4c2df7dc4085d213db029eff6b6fcde0152.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/daemon.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/daemon.rb b/lib/gitlab/daemon.rb index 2f4ae010e74..43c159fee27 100644 --- a/lib/gitlab/daemon.rb +++ b/lib/gitlab/daemon.rb @@ -10,8 +10,8 @@ module Gitlab @instance end - def self.instance - @instance ||= initialize_instance + def self.instance(*args) + @instance ||= initialize_instance(*args) end attr_reader :thread |