diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-26 04:14:54 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-26 04:14:54 +0300 |
| commit | d41b2085fee554b08992bbd5783c07a8350540a2 (patch) | |
| tree | 27b70a49b07d26f159ebf4a6479afa0ccc4beafc /app/views/import/gitlab | |
| parent | ee7364a6e47f1b6d0be7e0ecc7415e51a91974b6 (diff) | |
| parent | fda55f9145b5280db28cd6723789f95e2cb7b6c0 (diff) | |
Merge branch 'master' into 'master'
Change ordering so that confirm is removed from attrs before attempting to User.build_user
Possible fix gitlab-org/gitlab-ce#1296
See merge request !445
Diffstat (limited to 'app/views/import/gitlab')
0 files changed, 0 insertions, 0 deletions