diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-11-01 21:49:28 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-11-01 21:49:28 +0000 |
| commit | eab26218e65c388b49cdc502ea25d80c41d5284a (patch) | |
| tree | fa3a8fea0ab16715dcc358a99a73eb188932c5a8 /.gitlab-ci.yml | |
| parent | 392e3bfad3c39dc4e4e8237b71e2ed9fd9bffcb0 (diff) | |
| parent | 3e6358585147a39b09cd639a75ffa3b2f13a2003 (diff) | |
| download | gitlab-ce-eab26218e65c388b49cdc502ea25d80c41d5284a.tar.gz | |
Merge branch 'user-model-merge-conflicts' into 'master'
Reduce merge conflicts in the User model
See merge request gitlab-org/gitlab-ce!22697
Diffstat (limited to '.gitlab-ci.yml')
0 files changed, 0 insertions, 0 deletions