diff options
| author | James Lopez <james@jameslopez.es> | 2016-01-29 14:27:10 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-01-29 14:27:10 +0100 |
| commit | 7ca6779654ed2da5ba31ab9256406feb1b7fb8ee (patch) | |
| tree | 8c3d1e2eb642b667c9e46babdc786a4d4dc3c789 /lib/ci/api/api.rb | |
| parent | 4d2da5fd2585fead823c4450e54613dadf882c0d (diff) | |
| parent | f5860ce6466bf8934bc01254351bffd005dfeafe (diff) | |
| download | gitlab-ce-7ca6779654ed2da5ba31ab9256406feb1b7fb8ee.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue
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 |