Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fixes #222, using deploy_keys endpoint #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asedge merged 2 commits into from
Mar 14, 2017
Merged

Fixes #222, using deploy_keys endpoint #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bdc7a9
Fixes #222, using deploy_keys endpoint
epintozzi Mar 2, 2017
e1a7f56
update changelog.md
epintozzi Mar 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- Allow issues to use NAMESPACE/REPO identifier (@brodock)
- Add issues subscribe/unsubscribe (@newellista)
- Add merge_requests subscribe/unsubscribe (@newellista)
- Updated `deploy_key` endpoints (@epintozzi)

### 3.7.0 (16/08/2016)

Expand Down
8 changes: 4 additions & 4 deletions lib/gitlab/client/projects.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ def remove_forked(project)
# @option options [Integer] :per_page The number of results per page.
# @return [Array<Gitlab::ObjectifiedHash>]
def deploy_keys(project, options={})
get("/projects/#{url_encode project}/keys", query: options)
get("/projects/#{url_encode project}/deploy_keys", query: options)
end

# Gets a single project deploy key.
Expand All @@ -348,7 +348,7 @@ def deploy_keys(project, options={})
# @param [Integer] id The ID of a deploy key.
# @return [Gitlab::ObjectifiedHash]
def deploy_key(project, id)
get("/projects/#{url_encode project}/keys/#{id}")
get("/projects/#{url_encode project}/deploy_keys/#{id}")
end

# Creates a new deploy key.
Expand All @@ -361,7 +361,7 @@ def deploy_key(project, id)
# @param [String] key The content of a deploy key.
# @return [Gitlab::ObjectifiedHash] Information about created deploy key.
def create_deploy_key(project, title, key)
post("/projects/#{url_encode project}/keys", body: { title: title, key: key })
post("/projects/#{url_encode project}/deploy_keys", body: { title: title, key: key })
end

# Enables a deploy key at the project.
Expand Down Expand Up @@ -397,7 +397,7 @@ def disable_deploy_key(project, key)
# @param [Integer] id The ID of a deploy key.
# @return [Gitlab::ObjectifiedHash] Information about deleted deploy key.
def delete_deploy_key(project, id)
delete("/projects/#{url_encode project}/keys/#{id}")
delete("/projects/#{url_encode project}/deploy_keys/#{id}")
end

# Forks a project into the user namespace.
Expand Down
12 changes: 6 additions & 6 deletions spec/gitlab/client/projects_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,12 +475,12 @@

describe ".deploy_keys" do
before do
stub_get("/projects/42/keys", "project_keys")
stub_get("/projects/42/deploy_keys", "project_keys")
@deploy_keys = Gitlab.deploy_keys(42)
end

it "should get the correct resource" do
expect(a_get("/projects/42/keys")).to have_been_made
expect(a_get("/projects/42/deploy_keys")).to have_been_made
end

it "should return project deploy keys" do
Expand All @@ -493,12 +493,12 @@

describe ".deploy_key" do
before do
stub_get("/projects/42/keys/2", "project_key")
stub_get("/projects/42/deploy_keys/2", "project_key")
@deploy_key = Gitlab.deploy_key(42, 2)
end

it "should get the correct resource" do
expect(a_get("/projects/42/keys/2")).to have_been_made
expect(a_get("/projects/42/deploy_keys/2")).to have_been_made
end

it "should return project deploy key" do
Expand All @@ -510,12 +510,12 @@

describe ".delete_deploy_key" do
before do
stub_delete("/projects/42/keys/2", "project_key")
stub_delete("/projects/42/deploy_keys/2", "project_key")
@deploy_key = Gitlab.delete_deploy_key(42, 2)
end

it "should get the correct resource" do
expect(a_delete("/projects/42/keys/2")).to have_been_made
expect(a_delete("/projects/42/deploy_keys/2")).to have_been_made
end

it "should return information about a deleted key" do
Expand Down