Merge pull request #2138 from sameersbn/remove-temp-fixes

remove "Fix for rebase in forks"

Author: sameersbn

Makefile

@@ -11,10 +11,14 @@ help:
 	@echo "   5. make purge        - stop and remove the container"
 
 build:
-	@docker build --tag=sameersbn/gitlab .
+	@docker build --tag=sameersbn/gitlab . \
+		--build-arg BUILD_DATE="$(shell date +"%Y-%m-%d %H:%M:%S%:z")" \
+		--build-arg VCS_REF=$(shell git rev-parse --short HEAD)
 
 release: build
-	@docker build --tag=sameersbn/gitlab:$(shell cat VERSION) .
+	@docker build --tag=sameersbn/gitlab:$(shell cat VERSION) . \
+		--build-arg BUILD_DATE="$(shell date +"%Y-%m-%d %H:%M:%S%:z")" \
+		--build-arg VCS_REF=$(git describe --tags --always)
 
 quickstart:
 	@echo "Starting postgresql container..."

assets/build/install.sh

@@ -137,14 +137,6 @@ rm -rf ${GITLAB_GITALY_BUILD_DIR}
 # remove go
 rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz ${GOROOT}
 
-# Fix for rebase in forks 
-echo "Linking $(command -v gitaly-ssh) to /"
-ln -s "$(command -v gitaly-ssh)" /
-
-# Fix for gitaly-hooks
-echo "Linking $(command -v gitaly-hooks) to /"
-ln -s "$(command -v gitaly-hooks)" /
-
 # remove HSTS config from the default headers, we configure it in nginx
 exec_as_git sed -i "/headers\['Strict-Transport-Security'\]/d" ${GITLAB_INSTALL_DIR}/app/controllers/application_controller.rb