Skip to content

Feature/fix source target project id types #33

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
merged 2 commits into from
Jun 4, 2016
Merged

Feature/fix source target project id types #33

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
02421b6
fixed source target project id types
nii236 Jun 4, 2016
2460b40
merge from master
nii236 Jun 4, 2016
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
4 changes: 2 additions & 2 deletions merge_requests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ type MergeRequest struct {
Description string `json:"description,omitempty"`
WorkInProgress bool `json:"work_in_progress,omitempty"`
MergeStatus string `json:"merge_status,omitempty"`
SourceProjectID string `json:"source_project_id,omitempty"`
TargetProjectID string `json:"target_project_id,omitempty"`
SourceProjectID int `json:"source_project_id,omitempty"`
TargetProjectID int `json:"target_project_id,omitempty"`
}

type ChangeItem struct {
Expand Down
4 changes: 2 additions & 2 deletions merge_requests_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ func TestProjectMergeRequest(t *testing.T) {
assert.Equal(t, err, nil)
assert.Equal(t, mr.TargetBranch, "master")
assert.Equal(t, mr.MergeStatus, "can_be_merged")
assert.Equal(t, mr.SourceProjectID, "2")
assert.Equal(t, mr.TargetProjectID, "3")
assert.Equal(t, mr.SourceProjectID, 2)
assert.Equal(t, mr.TargetProjectID, 3)
defer ts.Close()
}

Expand Down
4 changes: 2 additions & 2 deletions stubs/merge_requests/show.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
},
"source_project_id": "2",
"target_project_id": "3",
"source_project_id": 2,
"target_project_id": 3,
"description":"fixed login page css paddings",
"work_in_progress": false,
"merge_status": "can_be_merged"
Expand Down