Merge branch 'hot-reloading' into 'master'

Fix hot reloading for CI API See merge request !2617

Merge branch 'hot-reloading' into 'master'
Fix hot reloading for CI API See merge request !2617
1226d166 · Douwe Maan · a93f7099 · 5ea32ba4 · 1226d166
Commit 1226d166 authored Jan 27, 2016 by Douwe Maan
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/ci/api/api.rb lib/ci/api/api.rb +1 -1

No files found.
--- a/lib/ci/api/api.rb
+++ b/lib/ci/api/api.rb
@@ -25,7 +25,7 @@ module Ci

      format :json

-      helpers Helpers
+      helpers ::Ci::API::Helpers
      helpers ::API::Helpers
      helpers Gitlab::CurrentSettings