1. 19 Jul, 2015 1 commit
    • Stan Hu's avatar
      Merge branch 'fix-oauth-redirection' into 'master' · 247609a3
      Stan Hu authored
      Fix OAuth provider bug where GitLab would not go return to the redirect_uri after sign-in
      
      ### What does this MR do?
      
      This MR fixes a bug when GitLab is used as an OAuth provider (e.g. to GitLab CI) where the user is not redirected back to the original URI after a successful sign-in. This MR tweaks the Doorkeeper configuration to set the `user_return_to` Devise session variable, as mentioned in this [Stack Overflow](http://stackoverflow.com/questions/14504739/how-to-use-both-devise-and-doorkeeper-gems) post.
      
      ### Why was this MR needed?
      
      If you attempt to "Login via GitLab" from GitLab CI and aren't logged out completely, GitLab asks for your username and password. After you login, you get directed to the GitLab dashboard instead of back to GitLab CI. It's easy to reproduce:
      
      1. Set up a GitLab CI and GitLab instance (e.g. ci.gitlab.com, gitlab.com).
      2. Start an Incognito Window so that you are logged out of GitLab CI and GitLab.
      3. Go to the GitLab CI instance. Click the "Login with GitLab".
      4. Enter in your credentials.
      5. Watch your browser login to GitLab and not return to GitLab CI.
      
      ### What are the relevant issue numbers?
      
      Closes #1612
      
      See merge request !998
      247609a3
  2. 18 Jul, 2015 9 commits
  3. 17 Jul, 2015 24 commits
  4. 16 Jul, 2015 6 commits