summaryrefslogtreecommitdiff
path: root/workhorse/cmd
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-21 15:08:52 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-21 15:08:52 +0000
commita8f5aaa7081cc2d400fbac1106d9e94d02d70ab4 (patch)
treebac304f65fad253fe1081bc41d47997f1f87c7bd /workhorse/cmd
parent7e5b78ee035a9cb43c65c029e4305ff7357b07d2 (diff)
downloadgitlab-ce-a8f5aaa7081cc2d400fbac1106d9e94d02d70ab4.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/cmd')
-rw-r--r--workhorse/cmd/gitlab-resize-image/main.go2
-rw-r--r--workhorse/cmd/gitlab-zip-cat/main.go2
-rw-r--r--workhorse/cmd/gitlab-zip-metadata/main.go4
3 files changed, 4 insertions, 4 deletions
diff --git a/workhorse/cmd/gitlab-resize-image/main.go b/workhorse/cmd/gitlab-resize-image/main.go
index 81288c645eb..5b8ba95cd29 100644
--- a/workhorse/cmd/gitlab-resize-image/main.go
+++ b/workhorse/cmd/gitlab-resize-image/main.go
@@ -8,7 +8,7 @@ import (
"github.com/disintegration/imaging"
- "gitlab.com/gitlab-org/gitlab-workhorse/cmd/gitlab-resize-image/png"
+ "gitlab.com/gitlab-org/gitlab/workhorse/cmd/gitlab-resize-image/png"
)
func main() {
diff --git a/workhorse/cmd/gitlab-zip-cat/main.go b/workhorse/cmd/gitlab-zip-cat/main.go
index a0778a55ad2..12a4187bad1 100644
--- a/workhorse/cmd/gitlab-zip-cat/main.go
+++ b/workhorse/cmd/gitlab-zip-cat/main.go
@@ -11,7 +11,7 @@ import (
"gitlab.com/gitlab-org/labkit/mask"
- "gitlab.com/gitlab-org/gitlab-workhorse/internal/zipartifacts"
+ "gitlab.com/gitlab-org/gitlab/workhorse/internal/zipartifacts"
)
const progName = "gitlab-zip-cat"
diff --git a/workhorse/cmd/gitlab-zip-metadata/main.go b/workhorse/cmd/gitlab-zip-metadata/main.go
index faa85ab5366..14fa2066997 100644
--- a/workhorse/cmd/gitlab-zip-metadata/main.go
+++ b/workhorse/cmd/gitlab-zip-metadata/main.go
@@ -7,8 +7,8 @@ import (
"io"
"os"
- "gitlab.com/gitlab-org/gitlab-workhorse/cmd/gitlab-zip-metadata/limit"
- "gitlab.com/gitlab-org/gitlab-workhorse/internal/zipartifacts"
+ "gitlab.com/gitlab-org/gitlab/workhorse/cmd/gitlab-zip-metadata/limit"
+ "gitlab.com/gitlab-org/gitlab/workhorse/internal/zipartifacts"
)
const progName = "gitlab-zip-metadata"