diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-21 18:08:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-21 18:08:52 +0300 |
| commit | a8f5aaa7081cc2d400fbac1106d9e94d02d70ab4 (patch) | |
| tree | bac304f65fad253fe1081bc41d47997f1f87c7bd /workhorse/internal/api | |
| parent | 7e5b78ee035a9cb43c65c029e4305ff7357b07d2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/internal/api')
| -rw-r--r-- | workhorse/internal/api/api.go | 10 | ||||
| -rw-r--r-- | workhorse/internal/api/api_test.go | 9 | ||||
| -rw-r--r-- | workhorse/internal/api/block.go | 2 | ||||
| -rw-r--r-- | workhorse/internal/api/channel_settings.go | 2 |
4 files changed, 12 insertions, 11 deletions
diff --git a/workhorse/internal/api/api.go b/workhorse/internal/api/api.go index db1c4cbbc27..d3c19af030d 100644 --- a/workhorse/internal/api/api.go +++ b/workhorse/internal/api/api.go @@ -17,12 +17,12 @@ import ( "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitlab-workhorse/internal/config" - "gitlab.com/gitlab-org/gitlab-workhorse/internal/gitaly" - "gitlab.com/gitlab-org/gitlab-workhorse/internal/helper" - "gitlab.com/gitlab-org/gitlab-workhorse/internal/log" + "gitlab.com/gitlab-org/gitlab/workhorse/internal/config" + "gitlab.com/gitlab-org/gitlab/workhorse/internal/gitaly" + "gitlab.com/gitlab-org/gitlab/workhorse/internal/helper" + "gitlab.com/gitlab-org/gitlab/workhorse/internal/log" - "gitlab.com/gitlab-org/gitlab-workhorse/internal/secret" + "gitlab.com/gitlab-org/gitlab/workhorse/internal/secret" ) const ( diff --git a/workhorse/internal/api/api_test.go b/workhorse/internal/api/api_test.go index 5ab677c4233..4267a184a19 100644 --- a/workhorse/internal/api/api_test.go +++ b/workhorse/internal/api/api_test.go @@ -9,12 +9,13 @@ import ( "testing" "github.com/stretchr/testify/require" + "gitlab.com/gitlab-org/labkit/log" - "gitlab.com/gitlab-org/gitlab-workhorse/internal/helper" - "gitlab.com/gitlab-org/gitlab-workhorse/internal/secret" - "gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper" - "gitlab.com/gitlab-org/gitlab-workhorse/internal/upstream/roundtripper" + "gitlab.com/gitlab-org/gitlab/workhorse/internal/helper" + "gitlab.com/gitlab-org/gitlab/workhorse/internal/secret" + "gitlab.com/gitlab-org/gitlab/workhorse/internal/testhelper" + "gitlab.com/gitlab-org/gitlab/workhorse/internal/upstream/roundtripper" ) func TestGetGeoProxyURLWhenGeoSecondary(t *testing.T) { diff --git a/workhorse/internal/api/block.go b/workhorse/internal/api/block.go index 92322906c03..43763fc2b13 100644 --- a/workhorse/internal/api/block.go +++ b/workhorse/internal/api/block.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "gitlab.com/gitlab-org/gitlab-workhorse/internal/helper" + "gitlab.com/gitlab-org/gitlab/workhorse/internal/helper" ) // Prevent internal API responses intended for gitlab-workhorse from diff --git a/workhorse/internal/api/channel_settings.go b/workhorse/internal/api/channel_settings.go index bf3094c9c91..91798334a03 100644 --- a/workhorse/internal/api/channel_settings.go +++ b/workhorse/internal/api/channel_settings.go @@ -9,7 +9,7 @@ import ( "github.com/gorilla/websocket" - "gitlab.com/gitlab-org/gitlab-workhorse/internal/helper" + "gitlab.com/gitlab-org/gitlab/workhorse/internal/helper" ) type ChannelSettings struct { |