1. 10 6月, 2016 10 次提交
    • J
      Merge branch 'labels-ui-fix' into 'master' · d7e8adea
      Jacob Schatz 提交于
      Updated labels UI
      
      - Fixed alignment issues
      - Added dropdown to mobile to make the options look nicer & to save space
      
      ![Screen_Shot_2016-05-25_at_09.42.46](/uploads/ff59abd2310725965b388a62c6c1f2af/Screen_Shot_2016-05-25_at_09.42.46.png)
      
      Closes #14227
      
      See merge request !4273
      d7e8adea
    • J
      Merge branch '17562-filter-issues-is-only-visible-when-user-is-logged-in' into 'master' · ae126c55
      Jacob Schatz 提交于
      #17562 Fixes issues list filter only visible when user is logged in
      
      ## What does this MR do?
      
      1. Moves the issue/MR list search form out of the `if current_user` conditional, allowing guests to view the field.
      
      2.  Adds some margin to the search form, this is because in mobile view for guest users, the field was not supported by the RSS button and the New Issue button and would drop to meet the list.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Are there any views where the `margin-bottom: 12px` will affect the styling?
      
      ## Why was this MR needed?
      
      Guest user UX. Nothing feels better than increasing intangible value!
      
      ## What are the relevant issue numbers?
      
      Fixes #17562.
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-05-16_at_23.48.06](/uploads/cf0f0c48287517ac3e83b204b4ee09b2/Screen_Shot_2016-05-16_at_23.48.06.png)
      
      /cc @jschatz1 
      
      **UPDATE:**
      
      ![Screen_Shot_2016-05-20_at_16.13.22](/uploads/eb854838a514d0d54d0f13bde1636b8a/Screen_Shot_2016-05-20_at_16.13.22.png)
      
      See merge request !4171
      ae126c55
    • R
      Merge branch 'rs-fix-ldap-2fa-login' into 'master' · 8138f340
      Robert Speicher 提交于
      Fix 2FA-based login for LDAP users
      
      The OTP input form is shared by both LDAP and standard logins, but when
      coming from an LDAP-based form, the form parameters aren't nested in a
      Hash based on the `resource_name` value.
      
      Now we check for a nested `remember_me` parameter and use that if it
      exists, or fall back to the non-nested parameters if it doesn't.
      
      Somewhat confusingly, the OTP input form _does_ nest parameters under
      the `resource_name`, regardless of what type of login we're coming from,
      so that allows everything else to work as normal.
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18185
      
      See merge request !4493
      8138f340
    • J
      Merge branch 'fix-changelog' into 'master' · 95de1c1a
      Jacob Schatz 提交于
      Update CHANGELOG
      
      Fixes wrong changelog entry for !4175
      
      See merge request !4548
      95de1c1a
    • A
      Update CHANGELOG · cda68e92
      Alfredo Sumaran 提交于
      cda68e92
    • P
      Fixed failing label subscribe test · b0a80f69
      Phil Hughes 提交于
      b0a80f69
    • P
      Tests update · 8e8ec82d
      Phil Hughes 提交于
      8e8ec82d
    • P
      Updated subscribe icon · 9830f9a2
      Phil Hughes 提交于
      9830f9a2
    • P
      Fixed failing tests · 051dc1d2
      Phil Hughes 提交于
      051dc1d2
    • P
      Updated labels UI · e7ca709a
      Phil Hughes 提交于
      Closes #14227
      e7ca709a
  2. 09 6月, 2016 30 次提交