summary refs log tree commit diff
path: root/pkgs/applications/version-management/gitlab-shell
diff options
context:
space:
mode:
authorServilio Afre Puentes <afrepues@sharcnet.ca>2017-11-06 14:02:26 -0500
committerServilio Afre Puentes <afrepues@sharcnet.ca>2017-11-06 14:50:52 -0500
commit3e90cbe2688c34ccad9a155abc2525605c887b7b (patch)
treee7f6834eb63e933388d7a8905c9da88620fbbd97 /pkgs/applications/version-management/gitlab-shell
parent2aa4517d4fd8ff50a3f9f9a5a9631b4618eb6f37 (diff)
downloadnixlib-3e90cbe2688c34ccad9a155abc2525605c887b7b.tar
nixlib-3e90cbe2688c34ccad9a155abc2525605c887b7b.tar.gz
nixlib-3e90cbe2688c34ccad9a155abc2525605c887b7b.tar.bz2
nixlib-3e90cbe2688c34ccad9a155abc2525605c887b7b.tar.lz
nixlib-3e90cbe2688c34ccad9a155abc2525605c887b7b.tar.xz
nixlib-3e90cbe2688c34ccad9a155abc2525605c887b7b.tar.zst
nixlib-3e90cbe2688c34ccad9a155abc2525605c887b7b.zip
gitlab-shell: make the patches apply cleanly
Diffstat (limited to 'pkgs/applications/version-management/gitlab-shell')
-rw-r--r--pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
index e88dbad071f5..dd1ecafb8bf8 100644
--- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
@@ -3,7 +3,7 @@ index 0b11ce3..ffc3faf 100644
 --- a/lib/gitlab_projects.rb
 +++ b/lib/gitlab_projects.rb
 @@ -8,7 +8,7 @@ require_relative 'gitlab_metrics'
- require_relative 'gitlab_reference_counter'
+ require_relative 'gitlab_metrics'
  
  class GitlabProjects
 -  GLOBAL_HOOKS_DIRECTORY = File.join(ROOT_PATH, 'hooks')
@@ -15,7 +15,7 @@ diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
 index e7d0254..181ec8a 100644
 --- a/lib/gitlab_shell.rb
 +++ b/lib/gitlab_shell.rb
-@@ -163,7 +163,8 @@ class GitlabShell
+@@ -188,7 +188,8 @@ class GitlabShell
      end
  
      # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.