1. 11 Dec, 2015 5 commits
    • Stan Hu's avatar
      Update CHANGELOG for 7bb8bb85 · 74dcbec3
      Stan Hu authored
      74dcbec3
    • Stan Hu's avatar
      Merge branch 'auth_hash_fix' into 'master' · 7bb8bb85
      Stan Hu authored
      Expand character set of usernames created by Omniauth
      
      When a user is created by Omniauth, Gitlab tries to assign the username based on the information provided in the auth hash. If no nickname is present, it uses the part of the email address before the @. This portion of the email address is run through the `parameterize` method, presumably to convert Unicode characters to ASCII.
      
      `parameterize` strips out a number of characters that are valid in usernames. For example, `john.doe` is a valid Gitlab username, but parameterize will turn this into `john-doe`.
      
      Instead of `parameterize`, this merge request uses `normalize` to convert non-ascii characters. This allows all acceptable characters to be used when creating a username from an email address. 
      
      See merge request !660
      7bb8bb85
    • Dmitriy Zaporozhets's avatar
      Merge branch 'remove_check_icon_from_mr_page' into 'master' · 0d5d1f0e
      Dmitriy Zaporozhets authored
      Remove check icon from merged MRs
      
      Now that GitLab CI exposes the status of each MR in the MR page it seems "redundant" to have an extra icon next to the CI statuses.
      
      The "downside" is with people that don't use CI and don't see the statuses, but I don't think that this is that big a change that would miss to anyone.
      
      \cc @dzaporozhets @creamzy 
      
      How it looks now:
      
      ![screenshot-gitlab_com_2015-12-10_20-49-53](/uploads/414dcb5131eab2d9518dc77019116c96/screenshot-gitlab_com_2015-12-10_20-49-53.png)
      
      
      See merge request !2059
      0d5d1f0e
    • Dmitriy Zaporozhets's avatar
      Merge branch 'bump-devise-3.5.3' into 'master' · 3a82302f
      Dmitriy Zaporozhets authored
      Bump devise to 3.5.3 to fix reset token expiring after account creation
      
      Also fixes an incorrect redirect after login with relative URL root:
      
      Closes https://github.com/gitlabhq/gitlabhq/issues/8228
      
      Closes #2750
      
      See merge request !2056
      3a82302f
    • Corey Hinshaw's avatar
      d8b3c327
  2. 10 Dec, 2015 27 commits
  3. 09 Dec, 2015 8 commits