diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-08-27 22:13:13 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-08-27 22:13:13 +0400 |
| commit | 607be412d413ed032b0e1fccb89eedc2f05d1a15 (patch) | |
| tree | db3dc426829dd806e4e0477533c6a153dca2ee71 /lib | |
| parent | cb35a80e49ff3cdf3bd240640fc4d0dbd051922a (diff) | |
| parent | 0ce7ad57b74053be1525dd04ba444a0174073b3c (diff) | |
Merge pull request #985 from timspin/fix-gitolite-refs
Adds refs to gitolite.conf with $ at the end
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gitolite.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/gitolite.rb b/lib/gitlab/gitolite.rb index e82f9e62307..a3f34061471 100644 --- a/lib/gitlab/gitolite.rb +++ b/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 |