diff options
author | Stan Hu <stanhu@gmail.com> | 2017-07-05 15:18:54 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-07-05 15:18:54 +0000 |
commit | 009c98bbfdc370e0a24b7a1a6b086e5e4b668a43 (patch) | |
tree | 7eba0dcb88e49148d4b23788992dab33edcacdb5 | |
parent | 4f207de6e989883795d4d428863a0237b99e37b9 (diff) | |
parent | 43322952599d2f284b9cbb3ab6a490a7180f6599 (diff) | |
download | gitlab-shell-009c98bbfdc370e0a24b7a1a6b086e5e4b668a43.tar.gz |
Merge branch 'sh-revert-141' into 'master'
Revert "Merge branch 'sh-disable-rubygems' into 'master'"
See merge request !143
-rwxr-xr-x | bin/authorized_keys | 2 | ||||
-rwxr-xr-x | bin/check | 2 | ||||
-rwxr-xr-x | bin/create-hooks | 2 | ||||
-rwxr-xr-x | bin/gitlab-keys | 2 | ||||
-rwxr-xr-x | bin/gitlab-projects | 2 | ||||
-rwxr-xr-x | bin/gitlab-shell | 2 | ||||
-rwxr-xr-x | bin/install | 2 | ||||
-rwxr-xr-x | hooks/post-receive | 2 | ||||
-rwxr-xr-x | hooks/pre-receive | 2 | ||||
-rwxr-xr-x | hooks/update | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/bin/authorized_keys b/bin/authorized_keys index 0f596bb..ca01646 100755 --- a/bin/authorized_keys +++ b/bin/authorized_keys @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby --disable-gems +#!/usr/bin/env ruby # # GitLab shell authorized_keys. Query GitLab API to get the authorized command for a given ssh key fingerprint @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby --disable-gems +#!/usr/bin/env ruby require_relative '../lib/gitlab_init' require_relative '../lib/gitlab_net' diff --git a/bin/create-hooks b/bin/create-hooks index 4c48ecc..d4111dc 100755 --- a/bin/create-hooks +++ b/bin/create-hooks @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby --disable-gems +#!/usr/bin/env ruby # Recreate GitLab hooks in the Git repositories managed by GitLab. # diff --git a/bin/gitlab-keys b/bin/gitlab-keys index 7340e52..9eb1950 100755 --- a/bin/gitlab-keys +++ b/bin/gitlab-keys @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby --disable-gems +#!/usr/bin/env ruby require_relative '../lib/gitlab_init' diff --git a/bin/gitlab-projects b/bin/gitlab-projects index aa05c25..22b0022 100755 --- a/bin/gitlab-projects +++ b/bin/gitlab-projects @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby --disable-gems +#!/usr/bin/env ruby require_relative '../lib/gitlab_init' diff --git a/bin/gitlab-shell b/bin/gitlab-shell index ed58a0a..6ef572f 100755 --- a/bin/gitlab-shell +++ b/bin/gitlab-shell @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby --disable-gems +#!/usr/bin/env ruby unless ENV['SSH_CONNECTION'] puts "Only ssh allowed" diff --git a/bin/install b/bin/install index 69dd920..e9c1654 100755 --- a/bin/install +++ b/bin/install @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby --disable-gems +#!/usr/bin/env ruby require_relative '../lib/gitlab_init' diff --git a/hooks/post-receive b/hooks/post-receive index 70e9ebc..3504a48 100755 --- a/hooks/post-receive +++ b/hooks/post-receive @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby --disable-gems +#!/usr/bin/env ruby # This file was placed here by GitLab. It makes sure that your pushed commits # will be processed properly. diff --git a/hooks/pre-receive b/hooks/pre-receive index eed4620..e8e04d8 100755 --- a/hooks/pre-receive +++ b/hooks/pre-receive @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby --disable-gems +#!/usr/bin/env ruby # This file was placed here by GitLab. It makes sure that your pushed commits # will be processed properly. diff --git a/hooks/update b/hooks/update index 81414d2..4c2fc08 100755 --- a/hooks/update +++ b/hooks/update @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby --disable-gems +#!/usr/bin/env ruby # This file was placed here by GitLab. It makes sure that your pushed commits # will be processed properly. |