app/workers/stuck_ci_builds_worker.rb · e3a3242aec18cbf1ac9f88fef33676d0bfa08732 · nexedi / gitlab-ce

You need to sign in or sign up before continuing.

Merge remote-tracking branch 'ce/master' into ce-to-ee-master · 270800f9

Robert Speicher authored Jun 15, 2016

Conflicts:

- app/views/admin/dashboard/index.html.haml
- app/views/layouts/nav/_project_settings.html.haml
- app/views/shared/members/_member.html.haml

270800f9

stuck_ci_builds_worker.rb 574 Bytes

Replace stuck_ci_builds_worker.rb