diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-10-20 17:12:23 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-10-20 17:12:23 +0200 |
| commit | e4008bc415c112db6b2200fb9c79431ad4ffbecc (patch) | |
| tree | ecedd7a4db93e1cdcebfed0c9afa194fbee30078 /app/models/ability.rb | |
| parent | a321404fde85fba6b09cbf1a56914f3a2ae555e4 (diff) | |
| parent | befff6827a2cf81f6565b99212652a70139aa2b6 (diff) | |
| download | gitlab-ce-git-archive-improvements-2.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-improvements-2git-archive-improvements-2
Diffstat (limited to 'app/models/ability.rb')
| -rw-r--r-- | app/models/ability.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index 38bc2086683..b72178fa126 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -189,7 +189,8 @@ class Ability :change_visibility_level, :rename_project, :remove_project, - :archive_project + :archive_project, + :remove_fork_project ] end |