diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-03-18 14:31:33 +0200 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-03-18 14:31:33 +0200 |
| commit | 4d3e8ceea562683a8ee3a87a45ece6c476558446 (patch) | |
| tree | a83c195a72ac7e32edb4888e733792302c13505f /lib/ci/api/api.rb | |
| parent | 11dda8db29a4843026464c0a61f65ada20646e3b (diff) | |
| parent | dadd28e317ace1e3d3a2a02926eb352832b97f08 (diff) | |
| download | gitlab-ce-4d3e8ceea562683a8ee3a87a45ece6c476558446.tar.gz | |
Merge branch 'master' into docs_select_version_to_install
Diffstat (limited to 'lib/ci/api/api.rb')
| -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 |