8b551ee318
Conflicts: app/controllers/projects/services_controller.rb app/models/project_services/emails_on_push_service.rb |
||
---|---|---|
.. | ||
auto_merge_worker.rb | ||
emails_on_push_worker.rb | ||
gitlab_shell_worker.rb | ||
irker_worker.rb | ||
post_receive.rb | ||
project_service_worker.rb | ||
project_web_hook_worker.rb | ||
repository_import_worker.rb | ||
system_hook_worker.rb |