diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-01 13:51:05 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-01 13:51:05 +0100 |
| commit | 51574d779cac5b97ffb7603db783a26bfd6da1e6 (patch) | |
| tree | cd75ea27e009328a788abbaf0f60c6a4f46dfc44 /lib/ci/api/api.rb | |
| parent | 64c8ee47c96d9245081abdf1b9d4ec39cdfc5883 (diff) | |
| parent | da8e0f86595299740a344309cb5963854b61c4a6 (diff) | |
| download | gitlab-ce-51574d779cac5b97ffb7603db783a26bfd6da1e6.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs
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 |