diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2017-09-01 09:21:18 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2017-09-01 09:21:18 +0200 |
| commit | 28060caa0ade7566a38e3ed17f2db8bf9116dc1b (patch) | |
| tree | 3886373472541059bf04cd95dbc4595189f0d600 /lib/api/helpers | |
| parent | 7d38df306c73af354286cecb24b19155e537797b (diff) | |
| parent | 6f96ccaa7dd53a7462b86a0ebe8af66afde86aa2 (diff) | |
| download | gitlab-ce-28060caa0ade7566a38e3ed17f2db8bf9116dc1b.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'lib/api/helpers')
| -rw-r--r-- | lib/api/helpers/internal_helpers.rb | 4 | ||||
| -rw-r--r-- | lib/api/helpers/runner.rb | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb index ecb79317093..f57ff0f2632 100644 --- a/lib/api/helpers/internal_helpers.rb +++ b/lib/api/helpers/internal_helpers.rb @@ -42,6 +42,10 @@ module API ::Users::ActivityService.new(actor, 'Git SSH').execute if commands.include?(params[:action]) end + def merge_request_urls + ::MergeRequests::GetUrlsService.new(project).execute(params[:changes]) + end + private def set_project diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb index f8645e364ce..282af32ca94 100644 --- a/lib/api/helpers/runner.rb +++ b/lib/api/helpers/runner.rb @@ -1,6 +1,8 @@ module API module Helpers module Runner + include Gitlab::CurrentSettings + JOB_TOKEN_HEADER = 'HTTP_JOB_TOKEN'.freeze JOB_TOKEN_PARAM = :token UPDATE_RUNNER_EVERY = 10 * 60 |