Merge branch 'fix-todo-allow_collaboration' into 'master'

Update TODO: allow_collaboration column renaming See merge request gitlab-org/gitlab-ce!30291

Merge branch 'fix-todo-allow_collaboration' into 'master'
Update TODO: allow_collaboration column renaming See merge request gitlab-org/gitlab-ce!30291
1d7680c6 · Dmitriy Zaporozhets · fa4c409d · a0194172 · 1d7680c6
Commit 1d7680c6 authored Jul 03, 2019 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

app/models/merge_request.rb app/models/merge_request.rb +1 -0

No files found.
--- 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