diff options
author | Rémy Coutable <remy@rymai.me> | 2018-06-06 10:43:10 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-06-06 10:43:10 +0300 |
commit | eaa8836b1d7264391e0b51c1e4d7c7b873f76a43 (patch) | |
tree | 924e501803da31875427c8a68e9ddf5b3c916a60 /spec | |
parent | e0ca6ccbc926ebe3ad9e90bc993b9fd20fd37acb (diff) | |
parent | 078a5dcd1b285fdb1f2ec029054da389b9e1203f (diff) |
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
Diffstat (limited to 'spec')
-rw-r--r-- | spec/requests/api/internal_spec.rb | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb index 5dc3ddd4b36..bc32372d3a9 100644 --- a/spec/requests/api/internal_spec.rb +++ b/spec/requests/api/internal_spec.rb @@ -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) |