| Summary: | [client] client should redirect to the landing page or the login page depending on whether user creation is enabled | ||
|---|---|---|---|
| Product: | [ECD] Orion | Reporter: | Umar Bolatov <ubolatov> |
| Component: | Client | Assignee: | Umar Bolatov <ubolatov> |
| Status: | RESOLVED FIXED | QA Contact: | |
| Severity: | normal | ||
| Priority: | P3 | CC: | ahunter.eclipse |
| Version: | 8.0 | ||
| Target Milestone: | 9.0 | ||
| Hardware: | PC | ||
| OS: | Windows 7 | ||
| See Also: |
https://git.eclipse.org/r/44513 https://git.eclipse.org/c/orion/org.eclipse.orion.client.git/commit/?id=570ff5effe77b894e1acc821dfea3c722fcda81c |
||
| Whiteboard: | |||
|
Description
Umar Bolatov
New Gerrit change created: https://git.eclipse.org/r/44513 I seem to be getting a merge conflict, maybe I merged from gerrit out of order? (In reply to Anthony Hunter from comment #2) > I seem to be getting a merge conflict, maybe I merged from gerrit out of > order? Hmmmm... Maybe it's because the previously merged patch also modified the same files as this patch. Not sure how one would deal with this. Grant ran into the same issue when merging some of my changes. He might be able to help. (In reply to Eclipse Genie from comment #1) > New Gerrit change created: https://git.eclipse.org/r/44513 Can you cancel this Gerrit change and push a new one based on the latest bits? (In reply to Anthony Hunter from comment #4) > (In reply to Eclipse Genie from comment #1) > > New Gerrit change created: https://git.eclipse.org/r/44513 > > Can you cancel this Gerrit change and push a new one based on the latest > bits? Ok, I will. Gerrit change https://git.eclipse.org/r/44513 was merged to [master]. Commit: http://git.eclipse.org/c/orion/org.eclipse.orion.client.git/commit/?id=570ff5effe77b894e1acc821dfea3c722fcda81c (In reply to Eclipse Genie from comment #6) > Gerrit change https://git.eclipse.org/r/44513 was merged to [master]. > Commit: > http://git.eclipse.org/c/orion/org.eclipse.orion.client.git/commit/ > ?id=570ff5effe77b894e1acc821dfea3c722fcda81c This has been resolved |