Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ require (
github.com/logrusorgru/aurora/v4 v4.0.0
github.com/muesli/reflow v0.3.0
github.com/prometheus-community/pro-bing v0.7.0
gitlab.com/gitlab-org/api/client-go v0.116.0
gitlab.com/gitlab-org/api/client-go v0.160.1
gopkg.in/yaml.v3 v3.0.1
)

Expand Down Expand Up @@ -156,7 +156,7 @@ require (
github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
github.com/hekmon/cunits/v2 v2.1.0 // indirect
github.com/huandu/xstrings v1.4.0 // indirect
github.com/iancoleman/orderedmap v0.3.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,8 @@ github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9n
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUrx/c8Unxc48=
github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
Expand Down Expand Up @@ -773,8 +773,8 @@ github.com/zmb3/spotify v1.3.0 h1:6Z2F1IMx0Hviq/dpf8nFwvKPppFEMXn8yfReSBVi16k=
github.com/zmb3/spotify v1.3.0/go.mod h1:GD7AAEMUJVYc2Z7p2a2S0E3/5f/KxM/vOnErNr4j+Tw=
github.com/zorkian/go-datadog-api v2.30.0+incompatible h1:R4ryGocppDqZZbnNc5EDR8xGWF/z/MxzWnqTUijDQes=
github.com/zorkian/go-datadog-api v2.30.0+incompatible/go.mod h1:PkXwHX9CUQa/FpB9ZwAD45N1uhCW4MT/Wj7m36PbKss=
gitlab.com/gitlab-org/api/client-go v0.116.0 h1:Dy534gtZPMrnm3fAcmQRMadrcoUyFO4FQ4rXlSAdHAw=
gitlab.com/gitlab-org/api/client-go v0.116.0/go.mod h1:B29OfnZklmaoiR7uHANh9jTyfWEgmXvZLVEnosw2Dx0=
gitlab.com/gitlab-org/api/client-go v0.160.1 h1:7kEgo1yQ3ZMRps/2JbXzqbRb4Rs8n2ECkAv+6MadJw8=
gitlab.com/gitlab-org/api/client-go v0.160.1/go.mod h1:YqKcnxyV9OPAL5U99mpwBVEgBPz1PK/3qwqq/3h6bao=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
Expand Down
2 changes: 1 addition & 1 deletion modules/gitlab/display.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func (widget *Widget) displayMyIssues(project *GitlabProject, username string) s
return widget.renderIssues(issues)
}

func (widget *Widget) renderMergeRequests(mrs []*glab.MergeRequest) string {
func (widget *Widget) renderMergeRequests(mrs []*glab.BasicMergeRequest) string {

length := len(mrs)

Expand Down
18 changes: 9 additions & 9 deletions modules/gitlab/gitlab_project.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ type GitlabProject struct {
context *context
path string

MergeRequests []*glab.MergeRequest
AssignedMergeRequests []*glab.MergeRequest
AuthoredMergeRequests []*glab.MergeRequest
MergeRequests []*glab.BasicMergeRequest
AssignedMergeRequests []*glab.BasicMergeRequest
AuthoredMergeRequests []*glab.BasicMergeRequest
AssignedIssues []*glab.Issue
AuthoredIssues []*glab.Issue
RemoteProject *glab.Project
Expand Down Expand Up @@ -83,13 +83,13 @@ func (project *GitlabProject) StarCount() int {
/* -------------------- Unexported Functions -------------------- */

// myMergeRequests returns a list of merge requests
func (project *GitlabProject) myMergeRequests() []*glab.MergeRequest {
func (project *GitlabProject) myMergeRequests() []*glab.BasicMergeRequest {
return project.AuthoredMergeRequests
}

// myAssignedMergeRequests returns a list of merge requests
// assigned
func (project *GitlabProject) myAssignedMergeRequests() []*glab.MergeRequest {
func (project *GitlabProject) myAssignedMergeRequests() []*glab.BasicMergeRequest {
return project.AssignedMergeRequests
}

Expand All @@ -103,7 +103,7 @@ func (project *GitlabProject) myIssues() []*glab.Issue {
return project.AuthoredIssues
}

func (project *GitlabProject) loadMergeRequests() ([]*glab.MergeRequest, error) {
func (project *GitlabProject) loadMergeRequests() ([]*glab.BasicMergeRequest, error) {
state := "opened"
opts := glab.ListProjectMergeRequestsOptions{
State: &state,
Expand All @@ -118,7 +118,7 @@ func (project *GitlabProject) loadMergeRequests() ([]*glab.MergeRequest, error)
return mrs, nil
}

func (project *GitlabProject) loadAssignedMergeRequests() ([]*glab.MergeRequest, error) {
func (project *GitlabProject) loadAssignedMergeRequests() ([]*glab.BasicMergeRequest, error) {
state := "opened"
opts := glab.ListProjectMergeRequestsOptions{
State: &state,
Expand All @@ -134,7 +134,7 @@ func (project *GitlabProject) loadAssignedMergeRequests() ([]*glab.MergeRequest,
return mrs, nil
}

func (project *GitlabProject) loadAuthoredMergeRequests() ([]*glab.MergeRequest, error) {
func (project *GitlabProject) loadAuthoredMergeRequests() ([]*glab.BasicMergeRequest, error) {
state := "opened"
opts := glab.ListProjectMergeRequestsOptions{
State: &state,
Expand All @@ -154,7 +154,7 @@ func (project *GitlabProject) loadAssignedIssues() ([]*glab.Issue, error) {
state := "opened"
opts := glab.ListProjectIssuesOptions{
State: &state,
AssigneeID: glab.AssigneeID(project.context.user.ID),
AssigneeID: &project.context.user.ID,
}

issues, _, err := project.context.client.Issues.ListProjectIssues(project.path, &opts)
Expand Down