Update gitlab

王权利请求将github/fork/earlonrails/patch-2合并到6-1-stable

Created by: earlonrails

合并请求报告