summaryrefslogtreecommitdiff
path: root/lib/gitlab.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-06-08 15:08:45 +0000
committerDouwe Maan <douwe@gitlab.com>2018-06-08 15:08:45 +0000
commit6c963dcb39a2911c6cae1a70eb38574b8fd3ead6 (patch)
tree94a574d28d46b4c24cff135f4909095efcae9163 /lib/gitlab.rb
parent3cb560f83d7ac4e436f86b943b54560c0622d9bd (diff)
parentd18002efeda8ff10abe856e90cb1fa9de755974f (diff)
downloadgitlab-ce-6c963dcb39a2911c6cae1a70eb38574b8fd3ead6.tar.gz
Merge branch 'rails5-fix-47370' into 'master'
Use same gem versions for rails5 as for rails4 where possible Closes #47370, #46232, #47367, and #47373 See merge request gitlab-org/gitlab-ce!19498
Diffstat (limited to 'lib/gitlab.rb')
0 files changed, 0 insertions, 0 deletions