Merge pull request #985 from timspin/fix-gitolite-refs

Adds refs to gitolite.conf with $ at the end

Merge pull request #985 from timspin/fix-gitolite-refs
Adds refs to gitolite.conf with $ at the end
Dmitriy Zaporozhets
2 parents cb35a80e 0ce7ad57
Showing 1 changed file with 2 additions and 2 deletions Show diff stats
lib/gitlab/gitolite.rb
@@ -106,13 +106,13 @@ module Gitlab
       name_writers = project.repository_writers
       name_masters = project.repository_masters
  
-      pr_br = project.protected_branches.map(&:name).join(" ")
+      pr_br = project.protected_branches.map(&:name).join("$ ")
  
       repo.clean_permissions
  
       # Deny access to protected branches for writers
       unless name_writers.blank? || pr_br.blank?
-        repo.add_permission("-", pr_br, name_writers)
+        repo.add_permission("-", pr_br.strip + "$ ", name_writers)
       end
  
       # Add read permissions
...	...	@@ -106,13 +106,13 @@ module Gitlab
106	106	name_writers = project.repository_writers
107	107	name_masters = project.repository_masters
108	108
109		- pr_br = project.protected_branches.map(&:name).join(" ")
	109	+ pr_br = project.protected_branches.map(&:name).join("$ ")
110	110
111	111	repo.clean_permissions
112	112
113	113	# Deny access to protected branches for writers
114	114	unless name_writers.blank? \|\| pr_br.blank?
115		- repo.add_permission("-", pr_br, name_writers)
	115	+ repo.add_permission("-", pr_br.strip + "$ ", name_writers)
116	116	end
117	117
118	118	# Add read permissions
...	...