diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-08 18:08:45 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-08 18:08:45 +0300 |
| commit | 6c963dcb39a2911c6cae1a70eb38574b8fd3ead6 (patch) | |
| tree | 94a574d28d46b4c24cff135f4909095efcae9163 /app/controllers/users | |
| parent | 3cb560f83d7ac4e436f86b943b54560c0622d9bd (diff) | |
| parent | d18002efeda8ff10abe856e90cb1fa9de755974f (diff) | |
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 'app/controllers/users')
0 files changed, 0 insertions, 0 deletions