diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-27 18:26:59 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-27 18:26:59 +0300 |
| commit | 1226d166753e3c5acc5783ec767e2f83ee493b95 (patch) | |
| tree | 6e7e0ddf59a8c137607cee0acfef013512e34d38 /lib | |
| parent | a93f7099fa2ed98746ebfb5e55322d0afb5068f8 (diff) | |
| parent | 5ea32ba4982aef37f2a43b0324d45033992a9a60 (diff) | |
Merge branch 'hot-reloading' into 'master'
Fix hot reloading for CI API
See merge request !2617
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ci/api/api.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ci/api/api.rb b/lib/ci/api/api.rb index 5c347e432b4..4e85d2c3c74 100644 --- 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 |