diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-08-08 19:38:50 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-08-08 19:38:50 +0300 |
| commit | 59ce1af53b8d25d1b4ae8b6e59f069c5147ca572 (patch) | |
| tree | 8ed2415778c4ea1b0f546e0c04c3b7bf6cda0c96 /app/controllers/profiles | |
| parent | fd3a2cf76318a84dc6d3bab9bd9a767c5112106d (diff) | |
| parent | f04e9dad476cb6b2ac338dd8730d79b22f3fd070 (diff) | |
Merge branch 'fix/import-pending-user' into 'master'
Support pending invitation project members importing projects
Adds support for pending invitation project members on Import/Export - previously the import would fail.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19973
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5683
Diffstat (limited to 'app/controllers/profiles')
0 files changed, 0 insertions, 0 deletions