diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-01-28 15:12:24 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-01-28 15:12:24 +0100 |
| commit | b7ec476205173b9ca1780843ceb4617fdde0b9d7 (patch) | |
| tree | 85e3c3e5012eefc78b51823b1c45185df447b720 /lib/ci/api/api.rb | |
| parent | 30b0d06e9f74f0068926314ec03b003fbd86c8f2 (diff) | |
| parent | 9bf47f06ab69a1592cec87825aaaf5bb4adec464 (diff) | |
| download | gitlab-ce-mr-merge-base.tar.gz | |
Merge branch 'master' into mr-merge-basemr-merge-base
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 |