-
Eric Eastwood authored
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ee-31276-fix-diffs-with-edit-forking-needs Conflicts: app/assets/javascripts/blob/blob_fork_suggestion.js app/assets/javascripts/dispatcher.js spec/javascripts/blob/blob_fork_suggestion_spec.js
fa5af599