diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-07-03 12:32:05 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-07-03 12:32:05 +0000 |
| commit | 1d7680c6d7c6b312e1aa335034e08b017860edb9 (patch) | |
| tree | cc2ec57d896ab5e08927d7bb06e25bc0bc0e71a5 /app | |
| parent | fa4c409d78f296a8ef560e1c80a998e7d9c4bf57 (diff) | |
| parent | a0194172e0b11c7bb7e489cc0683dc083486dc51 (diff) | |
| download | gitlab-ce-1d7680c6d7c6b312e1aa335034e08b017860edb9.tar.gz | |
Merge branch 'fix-todo-allow_collaboration' into 'master'
Update TODO: allow_collaboration column renaming
See merge request gitlab-org/gitlab-ce!30291
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 82034f5946b..8391d526d18 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1353,6 +1353,7 @@ class MergeRequest < ApplicationRecord end # TODO: remove once production database rename completes + # https://gitlab.com/gitlab-org/gitlab-ce/issues/47592 alias_attribute :allow_collaboration, :allow_maintainer_to_push def allow_collaboration |