diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-03 11:24:08 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-03 11:24:08 +0000 |
| commit | e8f1331fa4b3f4c4037f6509b2a846f521f506fc (patch) | |
| tree | dcb2eab0999d85ac607102a4cb3f62594f64dfd1 | |
| parent | 7a0e1c7238033b33b7296701bfded56d4ad7f250 (diff) | |
| parent | cf53b361b98b899aeededde6aad1d4aca54fd8ff (diff) | |
| download | gitlab-ce-e8f1331fa4b3f4c4037f6509b2a846f521f506fc.tar.gz | |
Merge branch 'internal-api-post' into 'master'
Internal api post
See merge request !1059
| -rw-r--r-- | lib/api/internal.rb | 4 | ||||
| -rw-r--r-- | spec/requests/api/internal_spec.rb | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index 86fa149d050..5f484f63418 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -12,7 +12,9 @@ module API # ref - branch name # forced_push - forced_push # - get "/allowed" do + post "/allowed" do + status 200 + # Check for *.wiki repositories. # Strip out the .wiki from the pathname before finding the # project. This applies the correct project permissions to diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb index 47da82c061f..6df5ef38961 100644 --- a/spec/requests/api/internal_spec.rb +++ b/spec/requests/api/internal_spec.rb @@ -155,7 +155,7 @@ describe API::API, api: true do end def pull(key, project) - get( + post( api("/internal/allowed"), key_id: key.id, project: project.path_with_namespace, @@ -164,7 +164,7 @@ describe API::API, api: true do end def push(key, project) - get( + post( api("/internal/allowed"), changes: 'd14d6c0abdd253381df51a723d58691b2ee1ab08 570e7b2abdd848b95f2f578043fc23bd6f6fd24d refs/heads/master', key_id: key.id, @@ -174,7 +174,7 @@ describe API::API, api: true do end def archive(key, project) - get( + post( api("/internal/allowed"), ref: 'master', key_id: key.id, |