1. 11 Dec, 2015 12 commits
    • Zeger-Jan van de Weg's avatar
      Minor fix in flow 'Merge when build succeeds' · 5983e9bd
      Zeger-Jan van de Weg authored
      When a user, which is not the merge user, want to removes the source branch
      after the automatic merge this might fail because of checks in the
      DeleteBranchService
      5983e9bd
    • Grzegorz Bizon's avatar
      Merge branch 'fix/award-emoji-alert-width' into 'master' · eaecd397
      Grzegorz Bizon authored
      Fix award-emojis alert flash message
      
      This adds a new feature to `Flash` that allows to pin it after a
      specified selector. This removes a fixed position from such award-emoji
      alert, and makes it responsive by design of selector that this alert is
      pinned to.
      
      Closes #3996
      
      \cc @vsizov 
      
      See merge request !2065
      eaecd397
    • Grzegorz Bizon's avatar
      Update changelog · ef37041a
      Grzegorz Bizon authored
      ef37041a
    • Grzegorz Bizon's avatar
      Fix award-emojis alert flash message · d1211e0a
      Grzegorz Bizon authored
      This adds a new feature to `Flash` that allows to pin it after a
      specified selector. This removes a fixed position from such award-emoji
      alert, and makes it responsive by design of selector that this alert is
      pinned to.
      
      Closes #3996
      d1211e0a
    • Valery Sizov's avatar
      Merge branch 'emoji_aliases' into 'master' · 2029be03
      Valery Sizov authored
      Emoji aliases problem
      
      Fixes #3850
      
      See merge request !2064
      2029be03
    • Valery Sizov's avatar
      emoji aliases problem · 72b7d1f5
      Valery Sizov authored
      72b7d1f5
    • Douwe Maan's avatar
      cd97dba2
    • Valery Sizov's avatar
      Merge branch 'rs-update-gitlab_emoji' into 'master' · 73942b15
      Valery Sizov authored
      Bump gitlab_emoji to ~> 0.2.0
      
      A new version of this gem was released October 29th
      but was never bumped in GitLab.
      
      See merge request !1994
      73942b15
    • 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
  2. 10 Dec, 2015 28 commits