diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-19 11:34:48 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-19 11:34:48 +0200 |
| commit | 7ae139566b46050b31bf01a6302af560fc129819 (patch) | |
| tree | cc342c422373d89d12aa763a8a924d241192b4a1 /app/models/ability.rb | |
| parent | a32f7766098bf38b1028168b4919516460a562e9 (diff) | |
| parent | 8adeda37b55fc992e3cb15422cae5d9646640630 (diff) | |
| download | gitlab-ce-full-width-tables.tar.gz | |
Merge branch 'master' into full-width-tablesfull-width-tables
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 |