Commit 607be412d413ed032b0e1fccb89eedc2f05d1a15
Exists in
master
and in
4 other branches
Merge pull request #985 from timspin/fix-gitolite-refs
Adds refs to gitolite.conf with $ at the end
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
lib/gitlab/gitolite.rb
| @@ -106,13 +106,13 @@ module Gitlab | @@ -106,13 +106,13 @@ module Gitlab | ||
| 106 | name_writers = project.repository_writers | 106 | name_writers = project.repository_writers |
| 107 | name_masters = project.repository_masters | 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 | repo.clean_permissions | 111 | repo.clean_permissions |
| 112 | 112 | ||
| 113 | # Deny access to protected branches for writers | 113 | # Deny access to protected branches for writers |
| 114 | unless name_writers.blank? || pr_br.blank? | 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 | end | 116 | end |
| 117 | 117 | ||
| 118 | # Add read permissions | 118 | # Add read permissions |