Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2019-04-09 21:39:45 +0300
committerMichael Kozono <mkozono@gmail.com>2019-04-09 21:42:05 +0300
commitd7d6a37bb928f6146ba8850046b498344eaca137 (patch)
tree26083746ec316630664aad6b85faf7df736e8411 /lib/api/helpers/internal_helpers.rb
parentc640f2230c50312f64a6d0ec9fce639ae9527902 (diff)
Revert "Merge branch '43263-git-push-option-to-create-mr' into 'master'"revert-26752-for-broken-master
This reverts commit d95889b8a41037aa68250137b09b22b092776dfe, reversing changes made to 41adfde8ffa34eb45bd1d6f15ad6e80c8ef0f8a9.
Diffstat (limited to 'lib/api/helpers/internal_helpers.rb')
-rw-r--r--lib/api/helpers/internal_helpers.rb22
1 files changed, 0 insertions, 22 deletions
diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb
index 71c30ec99a5..3fd824877ae 100644
--- a/lib/api/helpers/internal_helpers.rb
+++ b/lib/api/helpers/internal_helpers.rb
@@ -43,28 +43,6 @@ module API
::MergeRequests::GetUrlsService.new(project).execute(params[:changes])
end
- def process_mr_push_options(push_options, project, user, changes)
- output = {}
-
- service = ::MergeRequests::PushOptionsHandlerService.new(
- project,
- user,
- changes,
- push_options
- ).execute
-
- if service.errors.present?
- output[:warnings] = push_options_warning(service.errors.join("\n\n"))
- end
-
- output
- end
-
- def push_options_warning(warning)
- options = Array.wrap(params[:push_options]).map { |p| "'#{p}'" }.join(' ')
- "Error encountered with push options #{options}: #{warning}"
- end
-
def redis_ping
result = Gitlab::Redis::SharedState.with { |redis| redis.ping }