Commit eaa8836b authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rails5-fix-47368' into 'master'

Rails 5 fix unknown keywords: changes, key_id, project, gl_repository, action,…

Closes #47368

See merge request gitlab-org/gitlab-ce!19466
parents e0ca6ccb 078a5dcd
---
title: 'Rails 5 fix unknown keywords: changes, key_id, project, gl_repository, action,
secret_token, protocol'
merge_request: 19466
author: Jasper Maes
type: fixed
...@@ -835,8 +835,7 @@ describe API::Internal do ...@@ -835,8 +835,7 @@ describe API::Internal do
end end
def push(key, project, protocol = 'ssh', env: nil) def push(key, project, protocol = 'ssh', env: nil)
post( params = {
api("/internal/allowed"),
changes: 'd14d6c0abdd253381df51a723d58691b2ee1ab08 570e7b2abdd848b95f2f578043fc23bd6f6fd24d refs/heads/master', changes: 'd14d6c0abdd253381df51a723d58691b2ee1ab08 570e7b2abdd848b95f2f578043fc23bd6f6fd24d refs/heads/master',
key_id: key.id, key_id: key.id,
project: project.full_path, project: project.full_path,
...@@ -845,7 +844,19 @@ describe API::Internal do ...@@ -845,7 +844,19 @@ describe API::Internal do
secret_token: secret_token, secret_token: secret_token,
protocol: protocol, protocol: protocol,
env: env env: env
) }
if Gitlab.rails5?
post(
api("/internal/allowed"),
params: params
)
else
post(
api("/internal/allowed"),
params
)
end
end end
def archive(key, project) def archive(key, project)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment