diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-06-08 13:12:51 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-06-08 13:12:51 +0000 |
| commit | 68cb1c2651fde0ae009beed10f81a74172ceeab1 (patch) | |
| tree | f8a191e5916b38d00abc747d35cd3e77dd640296 /app/models/merge_request.rb | |
| parent | e1f9f3c6ac8a71c8196c8eae7d4c573899466cdf (diff) | |
| download | gitlab-ce-68cb1c2651fde0ae009beed10f81a74172ceeab1.tar.gz | |
Revert rename allow collaboration column
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 535a2c362f2..324065c1162 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1125,8 +1125,11 @@ class MergeRequest < ActiveRecord::Base project.merge_requests.merged.where(author_id: author_id).empty? end + # TODO: remove once production database rename completes + alias_attribute :allow_collaboration, :allow_maintainer_to_push + def allow_collaboration - collaborative_push_possible? && super + collaborative_push_possible? && allow_maintainer_to_push end alias_method :allow_collaboration?, :allow_collaboration |