An error occurred while fetching the assigned milestone of the selected merge_request.
6 2 stable
Compare changes
- Dmitriy Zaporozhets authored
Conflict: This file was modified in the source branch, but removed in the target branch.
Ask someone with write access to resolve it.
+ 2
− 2
@@ -8,7 +8,7 @@ gitlab_user=$(ls -l config.ru | awk '{print $3}')
@@ -8,7 +8,7 @@ gitlab_user=$(ls -l config.ru | awk '{print $3}')
@@ -32,7 +32,7 @@ function start_no_deamonize
@@ -32,7 +32,7 @@ function start_no_deamonize
bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e $RAILS_ENV -P $sidekiq_pidfile $@ &>> $sidekiq_logfile