Skip to content
Commit ddb90d88 authored by Jan Provaznik's avatar Jan Provaznik
Browse files

Merge branch '55583-rename-method-conflicts' into 'master' 

Rename methods that conflict in Rails 5.2

Closes #55583

See merge request gitlab-org/gitlab-ce!28281
parents deccdd72 eb88ca76
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment