diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 18:09:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 18:09:00 +0300 |
| commit | c282dba898a4cb0645f88579339502a4e3778727 (patch) | |
| tree | 94a6457ce4438e085c9ae43bc51a2b5a29787bf2 /app/models/group.rb | |
| parent | 2c2dd5e36c4ed5f09f488be288882d98f9124d12 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/group.rb')
| -rw-r--r-- | app/models/group.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index b642b177df1..ea5d46e23f4 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -467,6 +467,10 @@ class Group < Namespace import_export_upload&.export_file end + def adjourned_deletion? + false + end + private def update_two_factor_requirement |