From c5ec176a1cfba4f170991ca7bf6296185b10f565 Mon Sep 17 00:00:00 2001
From: Kevin Lyda <kevin@ie.suberic.net>
Date: Sun, 21 Oct 2018 15:34:30 +0100
Subject: Gitlab auth issue (#79)

* Fix the gitlab oauth issue.

* Update for gitlab 11.1+

Versions beyond 11.1 (and possibly a few releases before) use a
different method for delivering tokens.  They also have disabled
version 3 of the api.

These changes address that and add a debugging mode for the server
that make it easier to debug issues like this in the future.

* Cleanup of PR.

Updated README. Removed code duplication.
---
 .../xanzy/go-gitlab/merge_request_approvals.go     | 125 ---------------------
 1 file changed, 125 deletions(-)
 delete mode 100644 vendor/github.com/xanzy/go-gitlab/merge_request_approvals.go

(limited to 'vendor/github.com/xanzy/go-gitlab/merge_request_approvals.go')

diff --git a/vendor/github.com/xanzy/go-gitlab/merge_request_approvals.go b/vendor/github.com/xanzy/go-gitlab/merge_request_approvals.go
deleted file mode 100644
index e03cb61..0000000
--- a/vendor/github.com/xanzy/go-gitlab/merge_request_approvals.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package gitlab
-
-import (
-	"fmt"
-	"net/url"
-	"time"
-)
-
-// MergeRequestApprovalsService handles communication with the merge request
-// approvals related methods of the GitLab API. This includes reading/updating
-// approval settings and approve/unapproving merge requests
-//
-// GitLab API docs: https://docs.gitlab.com/ee/api/merge_request_approvals.html
-type MergeRequestApprovalsService struct {
-	client *Client
-}
-
-// MergeRequestApprovals represents GitLab merge request approvals.
-//
-// GitLab API docs:
-// https://docs.gitlab.com/ee/api/merge_request_approvals.html#merge-request-level-mr-approvals
-type MergeRequestApprovals struct {
-	ID                int        `json:"id"`
-	ProjectID         int        `json:"project_id"`
-	Title             string     `json:"title"`
-	Description       string     `json:"description"`
-	State             string     `json:"state"`
-	CreatedAt         *time.Time `json:"created_at"`
-	UpdatedAt         *time.Time `json:"updated_at"`
-	MergeStatus       string     `json:"merge_status"`
-	ApprovalsRequired int        `json:"approvals_required"`
-	ApprovalsLeft     int        `json:"approvals_left"`
-	ApprovedBy        []struct {
-		User struct {
-			ID        int    `json:"id"`
-			Name      string `json:"name"`
-			Username  string `json:"username"`
-			State     string `json:"state"`
-			AvatarURL string `json:"avatar_url"`
-			WebURL    string `json:"web_url"`
-		} `json:"user"`
-	} `json:"approved_by"`
-	Approvers []struct {
-		User struct {
-			ID        int    `json:"id"`
-			Name      string `json:"name"`
-			Username  string `json:"username"`
-			State     string `json:"state"`
-			AvatarURL string `json:"avatar_url"`
-			WebURL    string `json:"web_url"`
-		} `json:"user"`
-	} `json:"approvers"`
-	ApproverGroups []struct {
-		Group struct {
-			ID                   int    `json:"id"`
-			Name                 string `json:"name"`
-			Path                 string `json:"path"`
-			Description          string `json:"description"`
-			Visibility           string `json:"visibility"`
-			AvatarURL            string `json:"avatar_url"`
-			WebURL               string `json:"web_url"`
-			FullName             string `json:"full_name"`
-			FullPath             string `json:"full_path"`
-			LFSEnabled           bool   `json:"lfs_enabled"`
-			RequestAccessEnabled bool   `json:"request_access_enabled"`
-		} `json:"group"`
-	} `json:"approver_group"`
-}
-
-func (m MergeRequestApprovals) String() string {
-	return Stringify(m)
-}
-
-// ApproveMergeRequestOptions represents the available ApproveMergeRequest() options.
-//
-// GitLab API docs:
-// https://docs.gitlab.com/ee/api/merge_request_approvals.html#approve-merge-request
-type ApproveMergeRequestOptions struct {
-	Sha *string `url:"sha,omitempty" json:"sha,omitempty"`
-}
-
-// ApproveMergeRequest approves a merge request on GitLab. If a non-empty sha
-// is provided then it must match the sha at the HEAD of the MR.
-//
-// GitLab API docs:
-// https://docs.gitlab.com/ee/api/merge_request_approvals.html#approve-merge-request
-func (s *MergeRequestApprovalsService) ApproveMergeRequest(pid interface{}, mr int, opt *ApproveMergeRequestOptions, options ...OptionFunc) (*MergeRequestApprovals, *Response, error) {
-	project, err := parseID(pid)
-	if err != nil {
-		return nil, nil, err
-	}
-	u := fmt.Sprintf("projects/%s/merge_requests/%d/approve", url.QueryEscape(project), mr)
-
-	req, err := s.client.NewRequest("GET", u, opt, options)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	m := new(MergeRequestApprovals)
-	resp, err := s.client.Do(req, m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, err
-}
-
-// UnapproveMergeRequest unapproves a previously approved merge request on GitLab.
-//
-// GitLab API docs:
-// https://docs.gitlab.com/ee/api/merge_request_approvals.html#unapprove-merge-request
-func (s *MergeRequestApprovalsService) UnapproveMergeRequest(pid interface{}, mr int, options ...OptionFunc) (*Response, error) {
-	project, err := parseID(pid)
-	if err != nil {
-		return nil, err
-	}
-	u := fmt.Sprintf("projects/%s/merge_requests/%d/unapprove", url.QueryEscape(project), mr)
-
-	req, err := s.client.NewRequest("GET", u, nil, options)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(req, nil)
-}
-- 
cgit v1.2.3