From 0c813ebeda571c6db1781f791bb46a937e469475 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Mon, 14 Dec 2015 17:52:57 +0100
Subject: [PATCH] Run "go fmt" for Kamil
---
helpers.go | 2 +-
upstream.go | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/helpers.go b/helpers.go
index 4a7af0d100c..bc4cfef318c 100644
--- a/helpers.go
+++ b/helpers.go
@@ -11,8 +11,8 @@ import (
"net/http"
"os"
"os/exec"
- "syscall"
"path"
+ "syscall"
)
func fail500(w http.ResponseWriter, err error) {
diff --git a/upstream.go b/upstream.go
index 70fd699ca46..b6ac589714f 100644
--- a/upstream.go
+++ b/upstream.go
@@ -7,12 +7,12 @@ In this file we handle request routing and interaction with the authBackend.
package main
import (
+ "fmt"
"log"
"net/http"
"net/http/httputil"
"net/url"
"strings"
- "fmt"
)
type serviceHandleFunc func(w http.ResponseWriter, r *gitRequest)
@@ -27,29 +27,29 @@ type upstream struct {
type authorizationResponse struct {
// GL_ID is an environment variable used by gitlab-shell hooks during 'git
// push' and 'git pull'
- GL_ID string
+ GL_ID string
// RepoPath is the full path on disk to the Git repository the request is
// about
- RepoPath string
+ RepoPath string
// ArchivePath is the full path where we should find/create a cached copy
// of a requested archive
- ArchivePath string
+ ArchivePath string
// ArchivePrefix is used to put extracted archive contents in a
// subdirectory
ArchivePrefix string
// CommitId is used do prevent race conditions between the 'time of check'
// in the GitLab Rails app and the 'time of use' in gitlab-workhorse.
- CommitId string
+ CommitId string
// StoreLFSPath is provided by the GitLab Rails application
// to mark where the tmp file should be placed
- StoreLFSPath string
+ StoreLFSPath string
// LFS object id
- LfsOid string
+ LfsOid string
// LFS object size
- LfsSize int64
+ LfsSize int64
// TmpPath is the path where we should store temporary files
// This is set by authorization middleware
- TempPath string
+ TempPath string
}
// A gitRequest is an *http.Request decorated with attributes returned by the
@@ -57,7 +57,7 @@ type authorizationResponse struct {
type gitRequest struct {
*http.Request
authorizationResponse
- u *upstream
+ u *upstream
// This field contains the URL.Path stripped from RelativeUrlRoot
relativeURIPath string
--
2.30.9