Automatic merge of gitlab-org/gitlab-ce master

f8704feb · GitLab Bot · 3200e277 · 1d7680c6 · f8704feb
Commit f8704feb authored Jul 03, 2019 by GitLab Bot
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
@@ -1355,6 +1355,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