diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-01 11:33:36 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-01 11:33:36 +0100 |
| commit | 2679ec40667958aa01c8480978b13a5727cac231 (patch) | |
| tree | c139ea7f3723c7f19de4b2bb9ff4cb1fb9133a1c /lib/ci/api/api.rb | |
| parent | 02afa6793cca042f8563b0e26472606c743d76f5 (diff) | |
| parent | da8e0f86595299740a344309cb5963854b61c4a6 (diff) | |
| download | gitlab-ce-2679ec40667958aa01c8480978b13a5727cac231.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-raw-workhorse
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 |