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

This commit is contained in:
Jasper Maes 2018-06-06 07:22:54 +02:00
parent 414af1213e
commit 078a5dcd1b
2 changed files with 20 additions and 3 deletions

View file

@ -0,0 +1,6 @@
---
title: 'Rails 5 fix unknown keywords: changes, key_id, project, gl_repository, action,
secret_token, protocol'
merge_request: 19466
author: Jasper Maes
type: fixed

View file

@ -835,8 +835,7 @@ describe API::Internal do
end
def push(key, project, protocol = 'ssh', env: nil)
post(
api("/internal/allowed"),
params = {
changes: 'd14d6c0abdd253381df51a723d58691b2ee1ab08 570e7b2abdd848b95f2f578043fc23bd6f6fd24d refs/heads/master',
key_id: key.id,
project: project.full_path,
@ -845,7 +844,19 @@ describe API::Internal do
secret_token: secret_token,
protocol: protocol,
env: env
)
}
if Gitlab.rails5?
post(
api("/internal/allowed"),
params: params
)
else
post(
api("/internal/allowed"),
params
)
end
end
def archive(key, project)