diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2014-11-14 18:23:55 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2014-11-18 13:10:07 +0200 |
| commit | 53bf52f191612df92d993cbcd3c4d6c89ab9c95a (patch) | |
| tree | 48d6fc548d308f8fd83a78a0653a7720247306f4 /lib/gitlab/git_access_wiki.rb | |
| parent | a4e98f0ec985c91631f41c56317926f29365d95a (diff) | |
| download | gitlab-ce-53bf52f191612df92d993cbcd3c4d6c89ab9c95a.tar.gz | |
Better message for failed pushes because of git hooks
Conflicts:
lib/gitlab/git_access.rb
spec/lib/gitlab/git_access_spec.rb
Diffstat (limited to 'lib/gitlab/git_access_wiki.rb')
| -rw-r--r-- | lib/gitlab/git_access_wiki.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/git_access_wiki.rb b/lib/gitlab/git_access_wiki.rb index 9f0eb3be20f..f7d1428deb2 100644 --- a/lib/gitlab/git_access_wiki.rb +++ b/lib/gitlab/git_access_wiki.rb @@ -1,7 +1,11 @@ module Gitlab class GitAccessWiki < GitAccess - def change_allowed?(user, project, change) - user.can?(:write_wiki, project) + def change_allowed_check(user, project, change) + if user.can?(:write_wiki, project) + build_status_object(true) + else + build_status_object(false, "You don't have access") + end end end end |