Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e6bb8aa4b7 | |||
| 8a870336ee | |||
| b6a30802e2 | |||
| 5fcf4a6e13 | |||
| 1f79ca202d | |||
| 59fb74817c | |||
| aa941874be | |||
| bfd950a988 | |||
| 9d685f3a73 | |||
| 1f42c84783 | |||
| b79b935d9e | |||
| ee81f21da7 | |||
| 03cee75fc3 | |||
| 86c24d8570 | |||
| a5ce17cac3 | |||
| efae47c3b9 | |||
| fafbb08b19 | |||
| c31b74320c | |||
| 5be09cefe2 | |||
| 9a9f42e1b8 |
+9
-8
@@ -1,16 +1,16 @@
|
|||||||
language: go
|
language: go
|
||||||
go:
|
go:
|
||||||
- 1.13.15
|
- 1.15.6
|
||||||
- tip
|
- tip
|
||||||
matrix:
|
matrix:
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- go: tip
|
- go: tip
|
||||||
|
|
||||||
notifications:
|
notifications:
|
||||||
email:
|
email:
|
||||||
recipients: dean.karn@gmail.com
|
recipients: dean.karn@gmail.com
|
||||||
on_success: change
|
on_success: change
|
||||||
on_failure: always
|
on_failure: always
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- go get -u github.com/go-playground/overalls
|
- go get -u github.com/go-playground/overalls
|
||||||
@@ -21,14 +21,15 @@ before_install:
|
|||||||
- ln -s $GOPATH/src/github.com/$TRAVIS_REPO_SLUG $GOPATH/src/gopkg.in/webhooks.v3
|
- ln -s $GOPATH/src/github.com/$TRAVIS_REPO_SLUG $GOPATH/src/gopkg.in/webhooks.v3
|
||||||
- ln -s $GOPATH/src/github.com/$TRAVIS_REPO_SLUG $GOPATH/src/gopkg.in/webhooks.v4
|
- ln -s $GOPATH/src/github.com/$TRAVIS_REPO_SLUG $GOPATH/src/gopkg.in/webhooks.v4
|
||||||
- ln -s $GOPATH/src/github.com/$TRAVIS_REPO_SLUG $GOPATH/src/gopkg.in/webhooks.v5
|
- ln -s $GOPATH/src/github.com/$TRAVIS_REPO_SLUG $GOPATH/src/gopkg.in/webhooks.v5
|
||||||
|
- ln -s $GOPATH/src/github.com/$TRAVIS_REPO_SLUG $GOPATH/src/gopkg.in/webhooks.v6
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- go get -t ./...
|
- go get -t ./...
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- make test
|
- make test
|
||||||
|
|
||||||
after_success: |
|
after_success: |
|
||||||
[ $TRAVIS_GO_VERSION = 1.13.15 ] &&
|
[ $TRAVIS_GO_VERSION = 1.15.6 ] &&
|
||||||
overalls -project="github.com/go-playground/webhooks" -covermode=count -ignore=.git,_examples,testdata -debug &&
|
overalls -project="github.com/go-playground/webhooks" -covermode=count -ignore=.git,_examples,testdata -debug &&
|
||||||
goveralls -coverprofile=overalls.coverprofile -service travis-ci -repotoken $COVERALLS_TOKEN
|
goveralls -coverprofile=overalls.coverprofile -service travis-ci -repotoken $COVERALLS_TOKEN
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
Library webhooks
|
Library webhooks
|
||||||
================
|
================
|
||||||
<img align="right" src="https://raw.githubusercontent.com/go-playground/webhooks/v5/logo.png">
|
<img align="right" src="https://raw.githubusercontent.com/go-playground/webhooks/v6/logo.png">
|
||||||
[](https://travis-ci.org/go-playground/webhooks)
|
[](https://travis-ci.org/go-playground/webhooks)
|
||||||
[](https://coveralls.io/github/go-playground/webhooks?branch=v5)
|
[](https://coveralls.io/github/go-playground/webhooks?branch=v6)
|
||||||
[](https://goreportcard.com/report/go-playground/webhooks)
|
[](https://goreportcard.com/report/go-playground/webhooks)
|
||||||
[](https://godoc.org/gopkg.in/go-playground/webhooks.v5)
|
[](https://godoc.org/gopkg.in/go-playground/webhooks.v6)
|
||||||

|

|
||||||
|
|
||||||
Library webhooks allows for easy receiving and parsing of GitHub, Bitbucket and GitLab Webhook Events
|
Library webhooks allows for easy receiving and parsing of GitHub, Bitbucket and GitLab Webhook Events
|
||||||
@@ -24,17 +24,17 @@ Installation
|
|||||||
Use go get.
|
Use go get.
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
go get -u gopkg.in/go-playground/webhooks.v5
|
go get -u gopkg.in/go-playground/webhooks.v6
|
||||||
```
|
```
|
||||||
|
|
||||||
Then import the package into your own code.
|
Then import the package into your own code.
|
||||||
|
|
||||||
import "gopkg.in/go-playground/webhooks.v5"
|
import "gopkg.in/go-playground/webhooks.v6"
|
||||||
|
|
||||||
Usage and Documentation
|
Usage and Documentation
|
||||||
------
|
------
|
||||||
|
|
||||||
Please see http://godoc.org/gopkg.in/go-playground/webhooks.v5 for detailed usage docs.
|
Please see http://godoc.org/gopkg.in/go-playground/webhooks.v6 for detailed usage docs.
|
||||||
|
|
||||||
##### Examples:
|
##### Examples:
|
||||||
```go
|
```go
|
||||||
@@ -45,7 +45,7 @@ import (
|
|||||||
|
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"gopkg.in/go-playground/webhooks.v5/github"
|
"gopkg.in/go-playground/webhooks.v6/github"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
|
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"gopkg.in/go-playground/webhooks.v5/github"
|
"gopkg.in/go-playground/webhooks.v6/github"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
|
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"gopkg.in/go-playground/webhooks.v5/github"
|
"gopkg.in/go-playground/webhooks.v6/github"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|||||||
@@ -380,7 +380,7 @@ func TestWebhooks(t *testing.T) {
|
|||||||
filename: "../testdata/github/project-card.json",
|
filename: "../testdata/github/project-card.json",
|
||||||
headers: http.Header{
|
headers: http.Header{
|
||||||
"X-Github-Event": []string{"project_card"},
|
"X-Github-Event": []string{"project_card"},
|
||||||
"X-Hub-Signature": []string{"sha1=495dec0d6449d16b71f2ddcd37d595cb9b04b1d8"},
|
"X-Hub-Signature": []string{"sha1=f5ed1572b04f0e03c8d5f5e3f7fa63737bef76d7"},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -420,7 +420,7 @@ func TestWebhooks(t *testing.T) {
|
|||||||
filename: "../testdata/github/pull-request.json",
|
filename: "../testdata/github/pull-request.json",
|
||||||
headers: http.Header{
|
headers: http.Header{
|
||||||
"X-Github-Event": []string{"pull_request"},
|
"X-Github-Event": []string{"pull_request"},
|
||||||
"X-Hub-Signature": []string{"sha1=35712c8d2bc197b7d07621dcf20d2fb44620508f"},
|
"X-Hub-Signature": []string{"sha1=88972f972db301178aa13dafaf112d26416a15e6"},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
+39
-41
@@ -1662,6 +1662,11 @@ type IssueCommentPayload struct {
|
|||||||
Body string `json:"body"`
|
Body string `json:"body"`
|
||||||
AuthorAssociation string `json:"author_association"`
|
AuthorAssociation string `json:"author_association"`
|
||||||
} `json:"comment"`
|
} `json:"comment"`
|
||||||
|
Changes *struct {
|
||||||
|
Body *struct {
|
||||||
|
From string `json:"from"`
|
||||||
|
} `json:"body"`
|
||||||
|
} `json:"changes"`
|
||||||
Repository struct {
|
Repository struct {
|
||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
NodeID string `json:"node_id"`
|
NodeID string `json:"node_id"`
|
||||||
@@ -1826,6 +1831,14 @@ type IssuesPayload struct {
|
|||||||
ClosedAt *time.Time `json:"closed_at"`
|
ClosedAt *time.Time `json:"closed_at"`
|
||||||
Body string `json:"body"`
|
Body string `json:"body"`
|
||||||
} `json:"issue"`
|
} `json:"issue"`
|
||||||
|
Changes *struct {
|
||||||
|
Title *struct {
|
||||||
|
From string `json:"from"`
|
||||||
|
} `json:"title"`
|
||||||
|
Body *struct {
|
||||||
|
From string `json:"from"`
|
||||||
|
} `json:"body"`
|
||||||
|
} `json:"changes"`
|
||||||
Repository struct {
|
Repository struct {
|
||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
NodeID string `json:"node_id"`
|
NodeID string `json:"node_id"`
|
||||||
@@ -2254,16 +2267,7 @@ type MembershipPayload struct {
|
|||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
SiteAdmin bool `json:"site_admin"`
|
SiteAdmin bool `json:"site_admin"`
|
||||||
} `json:"sender"`
|
} `json:"sender"`
|
||||||
Team struct {
|
Team *Team `json:"team"`
|
||||||
Name string `json:"name"`
|
|
||||||
ID int64 `json:"id"`
|
|
||||||
NodeID string `json:"node_id"`
|
|
||||||
Slug string `json:"slug"`
|
|
||||||
Permission string `json:"permission"`
|
|
||||||
URL string `json:"url"`
|
|
||||||
MembersURL string `json:"members_url"`
|
|
||||||
RepositoriesURL string `json:"repositories_url"`
|
|
||||||
} `json:"team"`
|
|
||||||
Organization struct {
|
Organization struct {
|
||||||
Login string `json:"login"`
|
Login string `json:"login"`
|
||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
@@ -2986,13 +2990,14 @@ type PingPayload struct {
|
|||||||
type ProjectCardPayload struct {
|
type ProjectCardPayload struct {
|
||||||
Action string `json:"action"`
|
Action string `json:"action"`
|
||||||
ProjectCard struct {
|
ProjectCard struct {
|
||||||
URL string `json:"url"`
|
URL string `json:"url"`
|
||||||
ColumnURL string `json:"column_url"`
|
ProjectURL string `json:"project_url"`
|
||||||
ColumnID int64 `json:"column_id"`
|
ColumnURL string `json:"column_url"`
|
||||||
ID int64 `json:"id"`
|
ColumnID int64 `json:"column_id"`
|
||||||
NodeID string `json:"node_id"`
|
ID int64 `json:"id"`
|
||||||
Note *string `json:"note"`
|
NodeID string `json:"node_id"`
|
||||||
Creator struct {
|
Note *string `json:"note"`
|
||||||
|
Creator struct {
|
||||||
Login string `json:"login"`
|
Login string `json:"login"`
|
||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
NodeID string `json:"node_id"`
|
NodeID string `json:"node_id"`
|
||||||
@@ -3589,6 +3594,7 @@ type PullRequestPayload struct {
|
|||||||
Assignee *Assignee `json:"assignee"`
|
Assignee *Assignee `json:"assignee"`
|
||||||
Assignees []*Assignee `json:"assignees"`
|
Assignees []*Assignee `json:"assignees"`
|
||||||
Milestone *Milestone `json:"milestone"`
|
Milestone *Milestone `json:"milestone"`
|
||||||
|
Draft bool `json:"draft"`
|
||||||
CommitsURL string `json:"commits_url"`
|
CommitsURL string `json:"commits_url"`
|
||||||
ReviewCommentsURL string `json:"review_comments_url"`
|
ReviewCommentsURL string `json:"review_comments_url"`
|
||||||
ReviewCommentURL string `json:"review_comment_url"`
|
ReviewCommentURL string `json:"review_comment_url"`
|
||||||
@@ -5678,19 +5684,8 @@ type StatusPayload struct {
|
|||||||
|
|
||||||
// TeamPayload contains the information for GitHub's team hook event
|
// TeamPayload contains the information for GitHub's team hook event
|
||||||
type TeamPayload struct {
|
type TeamPayload struct {
|
||||||
Action string `json:"action"`
|
Action string `json:"action"`
|
||||||
Team struct {
|
Team *Team `json:"team"`
|
||||||
Name string `json:"name"`
|
|
||||||
ID int64 `json:"id"`
|
|
||||||
NodeID string `json:"node_id"`
|
|
||||||
Slug string `json:"slug"`
|
|
||||||
Description string `json:"description"`
|
|
||||||
Privacy string `json:"privacy"`
|
|
||||||
URL string `json:"url"`
|
|
||||||
MembersURL string `json:"members_url"`
|
|
||||||
RepositoriesURL string `json:"repositories_url"`
|
|
||||||
Permission string `json:"permission"`
|
|
||||||
} `json:"team"`
|
|
||||||
Organization struct {
|
Organization struct {
|
||||||
Login string `json:"login"`
|
Login string `json:"login"`
|
||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
@@ -5729,17 +5724,7 @@ type TeamPayload struct {
|
|||||||
|
|
||||||
// TeamAddPayload contains the information for GitHub's team_add hook event
|
// TeamAddPayload contains the information for GitHub's team_add hook event
|
||||||
type TeamAddPayload struct {
|
type TeamAddPayload struct {
|
||||||
Team struct {
|
Team *Team `json:"team"`
|
||||||
Name string `json:"name"`
|
|
||||||
ID int64 `json:"id"`
|
|
||||||
NodeID string `json:"node_id"`
|
|
||||||
Slug string `json:"slug"`
|
|
||||||
Description string `json:"description"`
|
|
||||||
Permission string `json:"permission"`
|
|
||||||
URL string `json:"url"`
|
|
||||||
MembersURL string `json:"members_url"`
|
|
||||||
RepositoriesURL string `json:"repositories_url"`
|
|
||||||
} `json:"team"`
|
|
||||||
Repository struct {
|
Repository struct {
|
||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
NodeID string `json:"node_id"`
|
NodeID string `json:"node_id"`
|
||||||
@@ -6111,3 +6096,16 @@ type Label struct {
|
|||||||
Color string `json:"color"`
|
Color string `json:"color"`
|
||||||
Default bool `json:"default"`
|
Default bool `json:"default"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Team contains GitHub's Team information
|
||||||
|
type Team struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
ID int64 `json:"id"`
|
||||||
|
NodeID string `json:"node_id"`
|
||||||
|
Slug string `json:"slug"`
|
||||||
|
Permission string `json:"permission"`
|
||||||
|
URL string `json:"url"`
|
||||||
|
MembersURL string `json:"members_url"`
|
||||||
|
RepositoriesURL string `json:"repositories_url"`
|
||||||
|
Parent *Team `json:"parent,omitempty"`
|
||||||
|
}
|
||||||
|
|||||||
+53
-29
@@ -112,7 +112,8 @@ type PipelineEventPayload struct {
|
|||||||
Project Project `json:"project"`
|
Project Project `json:"project"`
|
||||||
Commit Commit `json:"commit"`
|
Commit Commit `json:"commit"`
|
||||||
ObjectAttributes PipelineObjectAttributes `json:"object_attributes"`
|
ObjectAttributes PipelineObjectAttributes `json:"object_attributes"`
|
||||||
Jobs []Job `json:"jobs"`
|
MergeRequest MergeRequest `json:"merge_request"`
|
||||||
|
Builds []Build `json:"builds"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// CommentEventPayload contains the information for GitLab's comment event
|
// CommentEventPayload contains the information for GitLab's comment event
|
||||||
@@ -153,25 +154,27 @@ type BuildEventPayload struct {
|
|||||||
|
|
||||||
// JobEventPayload contains the information for GitLab's Job status change
|
// JobEventPayload contains the information for GitLab's Job status change
|
||||||
type JobEventPayload struct {
|
type JobEventPayload struct {
|
||||||
ObjectKind string `json:"object_kind"`
|
ObjectKind string `json:"object_kind"`
|
||||||
Ref string `json:"ref"`
|
Ref string `json:"ref"`
|
||||||
Tag bool `json:"tag"`
|
Tag bool `json:"tag"`
|
||||||
BeforeSHA string `json:"before_sha"`
|
BeforeSHA string `json:"before_sha"`
|
||||||
SHA string `json:"sha"`
|
SHA string `json:"sha"`
|
||||||
JobID int64 `json:"Job_id"`
|
BuildID int64 `json:"build_id"`
|
||||||
JobName string `json:"Job_name"`
|
BuildName string `json:"build_name"`
|
||||||
JobStage string `json:"Job_stage"`
|
BuildStage string `json:"build_stage"`
|
||||||
JobStatus string `json:"Job_status"`
|
BuildStatus string `json:"build_status"`
|
||||||
JobStartedAt customTime `json:"Job_started_at"`
|
BuildStartedAt customTime `json:"build_started_at"`
|
||||||
JobFinishedAt customTime `json:"Job_finished_at"`
|
BuildFinishedAt customTime `json:"build_finished_at"`
|
||||||
JobDuration int64 `json:"Job_duration"`
|
BuildDuration int64 `json:"build_duration"`
|
||||||
Job bool `json:"Job"`
|
BuildAllowFailure bool `json:"build_allow_failure"`
|
||||||
JobFailureReason string `json:"job_failure_reason"`
|
BuildFailureReason string `json:"build_failure_reason"`
|
||||||
ProjectID int64 `json:"project_id"`
|
PipelineID int64 `json:"pipeline_id"`
|
||||||
ProjectName string `json:"project_name"`
|
ProjectID int64 `json:"project_id"`
|
||||||
User User `json:"user"`
|
ProjectName string `json:"project_name"`
|
||||||
Commit BuildCommit `json:"commit"`
|
User User `json:"user"`
|
||||||
Repository Repository `json:"repository"`
|
Commit BuildCommit `json:"commit"`
|
||||||
|
Repository Repository `json:"repository"`
|
||||||
|
Runner Runner `json:"runner"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// SystemHookPayload contains the ObjectKind to match with real hook events
|
// SystemHookPayload contains the ObjectKind to match with real hook events
|
||||||
@@ -197,8 +200,8 @@ type Issue struct {
|
|||||||
IID int64 `json:"iid"`
|
IID int64 `json:"iid"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Job contains all of the GitLab job information
|
// Build contains all of the GitLab Build information
|
||||||
type Job struct {
|
type Build struct {
|
||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
Stage string `json:"stage"`
|
Stage string `json:"stage"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
@@ -240,6 +243,7 @@ type Wiki struct {
|
|||||||
type Commit struct {
|
type Commit struct {
|
||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
Message string `json:"message"`
|
Message string `json:"message"`
|
||||||
|
Title string `json:"title"`
|
||||||
Timestamp customTime `json:"timestamp"`
|
Timestamp customTime `json:"timestamp"`
|
||||||
URL string `json:"url"`
|
URL string `json:"url"`
|
||||||
Author Author `json:"author"`
|
Author Author `json:"author"`
|
||||||
@@ -290,7 +294,7 @@ type Project struct {
|
|||||||
Description string `json:"description"`
|
Description string `json:"description"`
|
||||||
WebURL string `json:"web_url"`
|
WebURL string `json:"web_url"`
|
||||||
AvatarURL string `json:"avatar_url"`
|
AvatarURL string `json:"avatar_url"`
|
||||||
GitSSSHURL string `json:"git_ssh_url"`
|
GitSSHURL string `json:"git_ssh_url"`
|
||||||
GitHTTPURL string `json:"git_http_url"`
|
GitHTTPURL string `json:"git_http_url"`
|
||||||
Namespace string `json:"namespace"`
|
Namespace string `json:"namespace"`
|
||||||
VisibilityLevel int64 `json:"visibility_level"`
|
VisibilityLevel int64 `json:"visibility_level"`
|
||||||
@@ -304,28 +308,40 @@ type Project struct {
|
|||||||
|
|
||||||
// Repository contains all of the GitLab repository information
|
// Repository contains all of the GitLab repository information
|
||||||
type Repository struct {
|
type Repository struct {
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
URL string `json:"url"`
|
URL string `json:"url"`
|
||||||
Description string `json:"description"`
|
Description string `json:"description"`
|
||||||
Homepage string `json:"homepage"`
|
Homepage string `json:"homepage"`
|
||||||
|
GitSSHURL string `json:"git_ssh_url"`
|
||||||
|
GitHTTPURL string `json:"git_http_url"`
|
||||||
|
VisibilityLevel int64 `json:"visibility_level"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// ObjectAttributes contains all of the GitLab object attributes information
|
// ObjectAttributes contains all of the GitLab object attributes information
|
||||||
type ObjectAttributes struct {
|
type ObjectAttributes struct {
|
||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
Title string `json:"title"`
|
Title string `json:"title"`
|
||||||
|
AssigneeIDS []int64 `json:"assignee_ids"`
|
||||||
AssigneeID int64 `json:"assignee_id"`
|
AssigneeID int64 `json:"assignee_id"`
|
||||||
AuthorID int64 `json:"author_id"`
|
AuthorID int64 `json:"author_id"`
|
||||||
ProjectID int64 `json:"project_id"`
|
ProjectID int64 `json:"project_id"`
|
||||||
CreatedAt customTime `json:"created_at"`
|
CreatedAt customTime `json:"created_at"`
|
||||||
UpdatedAt customTime `json:"updated_at"`
|
UpdatedAt customTime `json:"updated_at"`
|
||||||
ChangePosition Position `json:"change_position"`
|
UpdatedByID int64 `json:"updated_by_id"`
|
||||||
OriginalPosition Position `json:"original_position"`
|
LastEditedAt customTime `json:"last_edited_at"`
|
||||||
|
LastEditedByID int64 `json:"last_edited_by_id"`
|
||||||
|
RelativePosition int64 `json:"relative_position"`
|
||||||
Position Position `json:"position"`
|
Position Position `json:"position"`
|
||||||
BranchName string `json:"branch_name"`
|
BranchName string `json:"branch_name"`
|
||||||
Description string `json:"description"`
|
Description string `json:"description"`
|
||||||
MilestoneID int64 `json:"milestone_id"`
|
MilestoneID int64 `json:"milestone_id"`
|
||||||
State string `json:"state"`
|
State string `json:"state"`
|
||||||
|
StateID int64 `json:"state_id"`
|
||||||
|
Confidential bool `json:"confidential"`
|
||||||
|
DiscussionLocked bool `json:"discussion_locked"`
|
||||||
|
DueDate customTime `json:"due_date"`
|
||||||
|
TimeEstimate int64 `json:"time_estimate"`
|
||||||
|
TotalTimeSpent int64 `json:"total_time_spent"`
|
||||||
IID int64 `json:"iid"`
|
IID int64 `json:"iid"`
|
||||||
URL string `json:"url"`
|
URL string `json:"url"`
|
||||||
Action string `json:"action"`
|
Action string `json:"action"`
|
||||||
@@ -374,6 +390,13 @@ type PipelineObjectAttributes struct {
|
|||||||
CreatedAt customTime `json:"created_at"`
|
CreatedAt customTime `json:"created_at"`
|
||||||
FinishedAt customTime `json:"finished_at"`
|
FinishedAt customTime `json:"finished_at"`
|
||||||
Duration int64 `json:"duration"`
|
Duration int64 `json:"duration"`
|
||||||
|
Variables []Variable `json:"variables"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Variable contains pipeline variables
|
||||||
|
type Variable struct {
|
||||||
|
Key string `json:"key"`
|
||||||
|
Value string `json:"value"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Position defines a specific location, identified by paths line numbers and
|
// Position defines a specific location, identified by paths line numbers and
|
||||||
@@ -421,6 +444,7 @@ type MergeRequest struct {
|
|||||||
LastCommit LastCommit `json:"last_commit"`
|
LastCommit LastCommit `json:"last_commit"`
|
||||||
WorkInProgress bool `json:"work_in_progress"`
|
WorkInProgress bool `json:"work_in_progress"`
|
||||||
Assignee Assignee `json:"assignee"`
|
Assignee Assignee `json:"assignee"`
|
||||||
|
URL string `json:"url"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Assignee contains all of the GitLab assignee information
|
// Assignee contains all of the GitLab assignee information
|
||||||
|
|||||||
Vendored
+2
-1
@@ -2,6 +2,7 @@
|
|||||||
"action": "created",
|
"action": "created",
|
||||||
"project_card": {
|
"project_card": {
|
||||||
"url": "https://api.github.com/projects/columns/cards/1266091",
|
"url": "https://api.github.com/projects/columns/cards/1266091",
|
||||||
|
"project_url": "https://api.github.com/projects/6047634",
|
||||||
"column_url": "https://api.github.com/projects/columns/515520",
|
"column_url": "https://api.github.com/projects/columns/515520",
|
||||||
"column_id": 515520,
|
"column_id": 515520,
|
||||||
"id": 1266091,
|
"id": 1266091,
|
||||||
@@ -27,7 +28,7 @@
|
|||||||
},
|
},
|
||||||
"created_at": 1483569391,
|
"created_at": 1483569391,
|
||||||
"updated_at": 1483569391,
|
"updated_at": 1483569391,
|
||||||
"content_url": "https://api.github.com/repos/baxterthehacker/public-repo/issues/2"
|
"content_url": "https://api.github.com/repos/baxterthehacker/public-repo/issues/2"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"id": 35129377,
|
"id": 35129377,
|
||||||
|
|||||||
Vendored
+1
@@ -39,6 +39,7 @@
|
|||||||
"merge_commit_sha": null,
|
"merge_commit_sha": null,
|
||||||
"assignee": null,
|
"assignee": null,
|
||||||
"milestone": null,
|
"milestone": null,
|
||||||
|
"draft": false,
|
||||||
"commits_url": "https://api.github.com/repos/baxterthehacker/public-repo/pulls/1/commits",
|
"commits_url": "https://api.github.com/repos/baxterthehacker/public-repo/pulls/1/commits",
|
||||||
"review_comments_url": "https://api.github.com/repos/baxterthehacker/public-repo/pulls/1/comments",
|
"review_comments_url": "https://api.github.com/repos/baxterthehacker/public-repo/pulls/1/comments",
|
||||||
"review_comment_url": "https://api.github.com/repos/baxterthehacker/public-repo/pulls/comments{/number}",
|
"review_comment_url": "https://api.github.com/repos/baxterthehacker/public-repo/pulls/comments{/number}",
|
||||||
|
|||||||
Vendored
+47
-39
@@ -1,42 +1,50 @@
|
|||||||
{
|
{
|
||||||
"object_kind": "job",
|
"object_kind": "build",
|
||||||
"ref": "gitlab-script-trigger",
|
"ref": "gitlab-script-trigger",
|
||||||
"tag": false,
|
"tag": false,
|
||||||
"before_sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
|
"before_sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
|
||||||
|
"sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
|
||||||
|
"build_id": 1977,
|
||||||
|
"build_name": "test",
|
||||||
|
"build_stage": "test",
|
||||||
|
"build_status": "created",
|
||||||
|
"build_started_at": null,
|
||||||
|
"build_finished_at": null,
|
||||||
|
"build_duration": null,
|
||||||
|
"build_allow_failure": false,
|
||||||
|
"build_failure_reason": "script_failure",
|
||||||
|
"pipeline_id": 2366,
|
||||||
|
"project_id": 380,
|
||||||
|
"project_name": "gitlab-org/gitlab-test",
|
||||||
|
"user": {
|
||||||
|
"id": 3,
|
||||||
|
"name": "User",
|
||||||
|
"email": "user@gitlab.com",
|
||||||
|
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
|
||||||
|
},
|
||||||
|
"commit": {
|
||||||
|
"id": 2366,
|
||||||
"sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
|
"sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
|
||||||
"job_id": 1977,
|
"message": "test\n",
|
||||||
"job_name": "test",
|
"author_name": "User",
|
||||||
"job_stage": "test",
|
"author_email": "user@gitlab.com",
|
||||||
"job_status": "created",
|
"status": "created",
|
||||||
"job_started_at": null,
|
"duration": null,
|
||||||
"job_finished_at": null,
|
"started_at": null,
|
||||||
"job_duration": null,
|
"finished_at": null
|
||||||
"job_allow_failure": false,
|
},
|
||||||
"job_failure_reason": "script_failure",
|
"repository": {
|
||||||
"project_id": 380,
|
"name": "gitlab_test",
|
||||||
"project_name": "gitlab-org/gitlab-test",
|
"description": "Atque in sunt eos similique dolores voluptatem.",
|
||||||
"user": {
|
"homepage": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
|
||||||
"id": 3,
|
"git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
|
||||||
"name": "User",
|
"git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
|
||||||
"email": "user@gitlab.com"
|
"visibility_level": 20
|
||||||
},
|
},
|
||||||
"commit": {
|
"runner": {
|
||||||
"id": 2366,
|
"active": true,
|
||||||
"sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
|
"is_shared": false,
|
||||||
"message": "test\n",
|
"id": 380987,
|
||||||
"author_name": "User",
|
"description": "shared-runners-manager-6.gitlab.com"
|
||||||
"author_email": "user@gitlab.com",
|
|
||||||
"status": "created",
|
|
||||||
"duration": null,
|
|
||||||
"started_at": null,
|
|
||||||
"finished_at": null
|
|
||||||
},
|
|
||||||
"repository": {
|
|
||||||
"name": "gitlab_test",
|
|
||||||
"description": "Atque in sunt eos similique dolores voluptatem.",
|
|
||||||
"homepage": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
|
|
||||||
"git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
|
|
||||||
"git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
|
|
||||||
"visibility_level": 20
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|||||||
Vendored
+185
-166
@@ -1,175 +1,194 @@
|
|||||||
{
|
{
|
||||||
"object_kind": "pipeline",
|
"object_kind": "pipeline",
|
||||||
"object_attributes":{
|
"object_attributes":{
|
||||||
"id": 31,
|
"id": 31,
|
||||||
"ref": "master",
|
"ref": "master",
|
||||||
"tag": false,
|
"tag": false,
|
||||||
"sha": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
|
"sha": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
|
||||||
"before_sha": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
|
"before_sha": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
|
||||||
"status": "success",
|
"source": "merge_request_event",
|
||||||
"stages":[
|
|
||||||
"build",
|
|
||||||
"test",
|
|
||||||
"deploy"
|
|
||||||
],
|
|
||||||
"created_at": "2016-08-12 15:23:28 UTC",
|
|
||||||
"finished_at": "2016-08-12 15:26:29 UTC",
|
|
||||||
"duration": 63,
|
|
||||||
"variables": [
|
|
||||||
{
|
|
||||||
"key": "NESTOR_PROD_ENVIRONMENT",
|
|
||||||
"value": "us-west-1"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"user":{
|
|
||||||
"name": "Administrator",
|
|
||||||
"username": "root",
|
|
||||||
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
|
|
||||||
},
|
|
||||||
"project":{
|
|
||||||
"id": 1,
|
|
||||||
"name": "Gitlab Test",
|
|
||||||
"description": "Atque in sunt eos similique dolores voluptatem.",
|
|
||||||
"web_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
|
|
||||||
"avatar_url": null,
|
|
||||||
"git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
|
|
||||||
"git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
|
|
||||||
"namespace": "Gitlab Org",
|
|
||||||
"visibility_level": 20,
|
|
||||||
"path_with_namespace": "gitlab-org/gitlab-test",
|
|
||||||
"default_branch": "master"
|
|
||||||
},
|
|
||||||
"commit":{
|
|
||||||
"id": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
|
|
||||||
"message": "test\n",
|
|
||||||
"timestamp": "2016-08-12T17:23:21+02:00",
|
|
||||||
"url": "http://example.com/gitlab-org/gitlab-test/commit/bcbb5ec396a2c0f828686f14fac9b80b780504f2",
|
|
||||||
"author":{
|
|
||||||
"name": "User",
|
|
||||||
"email": "user@gitlab.com"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"jobs":[
|
|
||||||
{
|
|
||||||
"id": 380,
|
|
||||||
"stage": "deploy",
|
|
||||||
"name": "production",
|
|
||||||
"status": "skipped",
|
|
||||||
"created_at": "2016-08-12 15:23:28 UTC",
|
|
||||||
"started_at": null,
|
|
||||||
"finished_at": null,
|
|
||||||
"when": "manual",
|
|
||||||
"manual": true,
|
|
||||||
"user":{
|
|
||||||
"name": "Administrator",
|
|
||||||
"username": "root",
|
|
||||||
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
|
|
||||||
},
|
|
||||||
"runner": null,
|
|
||||||
"artifacts_file":{
|
|
||||||
"filename": null,
|
|
||||||
"size": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 377,
|
|
||||||
"stage": "test",
|
|
||||||
"name": "test-image",
|
|
||||||
"status": "success",
|
"status": "success",
|
||||||
|
"stages":[
|
||||||
|
"build",
|
||||||
|
"test",
|
||||||
|
"deploy"
|
||||||
|
],
|
||||||
"created_at": "2016-08-12 15:23:28 UTC",
|
"created_at": "2016-08-12 15:23:28 UTC",
|
||||||
"started_at": "2016-08-12 15:26:12 UTC",
|
|
||||||
"finished_at": null,
|
|
||||||
"when": "on_success",
|
|
||||||
"manual": false,
|
|
||||||
"user":{
|
|
||||||
"name": "Administrator",
|
|
||||||
"username": "root",
|
|
||||||
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
|
|
||||||
},
|
|
||||||
"runner": {
|
|
||||||
"id":380987,
|
|
||||||
"description":"shared-runners-manager-6.gitlab.com",
|
|
||||||
"active":true,
|
|
||||||
"is_shared":true
|
|
||||||
},
|
|
||||||
"artifacts_file":{
|
|
||||||
"filename": null,
|
|
||||||
"size": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 378,
|
|
||||||
"stage": "test",
|
|
||||||
"name": "test-build",
|
|
||||||
"status": "success",
|
|
||||||
"created_at": "2016-08-12 15:23:28 UTC",
|
|
||||||
"started_at": "2016-08-12 15:26:12 UTC",
|
|
||||||
"finished_at": "2016-08-12 15:26:29 UTC",
|
"finished_at": "2016-08-12 15:26:29 UTC",
|
||||||
"when": "on_success",
|
"duration": 63,
|
||||||
"manual": false,
|
"variables": [
|
||||||
"user":{
|
{
|
||||||
"name": "Administrator",
|
"key": "NESTOR_PROD_ENVIRONMENT",
|
||||||
"username": "root",
|
"value": "us-west-1"
|
||||||
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
|
}
|
||||||
},
|
]
|
||||||
"runner": {
|
},
|
||||||
"id":380987,
|
"merge_request": {
|
||||||
"description":"shared-runners-manager-6.gitlab.com",
|
"id": 1,
|
||||||
"active":true,
|
"iid": 1,
|
||||||
"is_shared":true
|
"title": "Test",
|
||||||
},
|
"source_branch": "test",
|
||||||
"artifacts_file":{
|
"source_project_id": 1,
|
||||||
"filename": null,
|
"target_branch": "master",
|
||||||
"size": null
|
"target_project_id": 1,
|
||||||
|
"state": "opened",
|
||||||
|
"merge_status": "can_be_merged",
|
||||||
|
"url": "http://192.168.64.1:3005/gitlab-org/gitlab-test/merge_requests/1"
|
||||||
|
},
|
||||||
|
"user":{
|
||||||
|
"name": "Administrator",
|
||||||
|
"username": "root",
|
||||||
|
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon",
|
||||||
|
"email": "user_email@gitlab.com"
|
||||||
|
},
|
||||||
|
"project":{
|
||||||
|
"id": 1,
|
||||||
|
"name": "Gitlab Test",
|
||||||
|
"description": "Atque in sunt eos similique dolores voluptatem.",
|
||||||
|
"web_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
|
||||||
|
"avatar_url": null,
|
||||||
|
"git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
|
||||||
|
"git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
|
||||||
|
"namespace": "Gitlab Org",
|
||||||
|
"visibility_level": 20,
|
||||||
|
"path_with_namespace": "gitlab-org/gitlab-test",
|
||||||
|
"default_branch": "master"
|
||||||
|
},
|
||||||
|
"commit":{
|
||||||
|
"id": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
|
||||||
|
"message": "test\n",
|
||||||
|
"timestamp": "2016-08-12T17:23:21+02:00",
|
||||||
|
"url": "http://example.com/gitlab-org/gitlab-test/commit/bcbb5ec396a2c0f828686f14fac9b80b780504f2",
|
||||||
|
"author":{
|
||||||
|
"name": "User",
|
||||||
|
"email": "user@gitlab.com"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
"builds":[
|
||||||
"id": 376,
|
{
|
||||||
"stage": "build",
|
"id": 380,
|
||||||
"name": "build-image",
|
"stage": "deploy",
|
||||||
"status": "success",
|
"name": "production",
|
||||||
"created_at": "2016-08-12 15:23:28 UTC",
|
"status": "skipped",
|
||||||
"started_at": "2016-08-12 15:24:56 UTC",
|
"created_at": "2016-08-12 15:23:28 UTC",
|
||||||
"finished_at": "2016-08-12 15:25:26 UTC",
|
"started_at": null,
|
||||||
"when": "on_success",
|
"finished_at": null,
|
||||||
"manual": false,
|
"when": "manual",
|
||||||
"user":{
|
"manual": true,
|
||||||
"name": "Administrator",
|
"allow_failure": false,
|
||||||
"username": "root",
|
"user":{
|
||||||
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
|
"name": "Administrator",
|
||||||
|
"username": "root",
|
||||||
|
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
|
||||||
|
},
|
||||||
|
"runner": null,
|
||||||
|
"artifacts_file":{
|
||||||
|
"filename": null,
|
||||||
|
"size": null
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"runner": {
|
{
|
||||||
"id":380987,
|
"id": 377,
|
||||||
"description":"shared-runners-manager-6.gitlab.com",
|
"stage": "test",
|
||||||
"active":true,
|
"name": "test-image",
|
||||||
"is_shared":true
|
"status": "success",
|
||||||
|
"created_at": "2016-08-12 15:23:28 UTC",
|
||||||
|
"started_at": "2016-08-12 15:26:12 UTC",
|
||||||
|
"finished_at": null,
|
||||||
|
"when": "on_success",
|
||||||
|
"manual": false,
|
||||||
|
"allow_failure": false,
|
||||||
|
"user":{
|
||||||
|
"name": "Administrator",
|
||||||
|
"username": "root",
|
||||||
|
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
|
||||||
|
},
|
||||||
|
"runner": {
|
||||||
|
"id":380987,
|
||||||
|
"description":"shared-runners-manager-6.gitlab.com",
|
||||||
|
"active":true,
|
||||||
|
"is_shared":true
|
||||||
|
},
|
||||||
|
"artifacts_file":{
|
||||||
|
"filename": null,
|
||||||
|
"size": null
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"artifacts_file":{
|
{
|
||||||
"filename": null,
|
"id": 378,
|
||||||
"size": null
|
"stage": "test",
|
||||||
|
"name": "test-build",
|
||||||
|
"status": "success",
|
||||||
|
"created_at": "2016-08-12 15:23:28 UTC",
|
||||||
|
"started_at": "2016-08-12 15:26:12 UTC",
|
||||||
|
"finished_at": "2016-08-12 15:26:29 UTC",
|
||||||
|
"when": "on_success",
|
||||||
|
"manual": false,
|
||||||
|
"allow_failure": false,
|
||||||
|
"user":{
|
||||||
|
"name": "Administrator",
|
||||||
|
"username": "root",
|
||||||
|
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
|
||||||
|
},
|
||||||
|
"runner": {
|
||||||
|
"id":380987,
|
||||||
|
"description":"shared-runners-manager-6.gitlab.com",
|
||||||
|
"active":true,
|
||||||
|
"is_shared":true
|
||||||
|
},
|
||||||
|
"artifacts_file":{
|
||||||
|
"filename": null,
|
||||||
|
"size": null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 376,
|
||||||
|
"stage": "build",
|
||||||
|
"name": "build-image",
|
||||||
|
"status": "success",
|
||||||
|
"created_at": "2016-08-12 15:23:28 UTC",
|
||||||
|
"started_at": "2016-08-12 15:24:56 UTC",
|
||||||
|
"finished_at": "2016-08-12 15:25:26 UTC",
|
||||||
|
"when": "on_success",
|
||||||
|
"manual": false,
|
||||||
|
"allow_failure": false,
|
||||||
|
"user":{
|
||||||
|
"name": "Administrator",
|
||||||
|
"username": "root",
|
||||||
|
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
|
||||||
|
},
|
||||||
|
"runner": {
|
||||||
|
"id":380987,
|
||||||
|
"description":"shared-runners-manager-6.gitlab.com",
|
||||||
|
"active":true,
|
||||||
|
"is_shared":true
|
||||||
|
},
|
||||||
|
"artifacts_file":{
|
||||||
|
"filename": null,
|
||||||
|
"size": null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 379,
|
||||||
|
"stage": "deploy",
|
||||||
|
"name": "staging",
|
||||||
|
"status": "created",
|
||||||
|
"created_at": "2016-08-12 15:23:28 UTC",
|
||||||
|
"started_at": null,
|
||||||
|
"finished_at": null,
|
||||||
|
"when": "on_success",
|
||||||
|
"manual": false,
|
||||||
|
"allow_failure": false,
|
||||||
|
"user":{
|
||||||
|
"name": "Administrator",
|
||||||
|
"username": "root",
|
||||||
|
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
|
||||||
|
},
|
||||||
|
"runner": null,
|
||||||
|
"artifacts_file":{
|
||||||
|
"filename": null,
|
||||||
|
"size": null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
]
|
||||||
{
|
|
||||||
"id": 379,
|
|
||||||
"stage": "deploy",
|
|
||||||
"name": "staging",
|
|
||||||
"status": "created",
|
|
||||||
"created_at": "2016-08-12 15:23:28 UTC",
|
|
||||||
"started_at": null,
|
|
||||||
"finished_at": null,
|
|
||||||
"when": "on_success",
|
|
||||||
"manual": false,
|
|
||||||
"user":{
|
|
||||||
"name": "Administrator",
|
|
||||||
"username": "root",
|
|
||||||
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
|
|
||||||
},
|
|
||||||
"runner": null,
|
|
||||||
"artifacts_file":{
|
|
||||||
"filename": null,
|
|
||||||
"size": null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user