1. 28 Mar, 2014 3 commits
    • Dmitriy Zaporozhets's avatar
      Merge branch 'ldap_nickname' into 'master' · e6fbf79b
      Dmitriy Zaporozhets authored
      Remove omniauth-ldap nickname bug workaround
      e6fbf79b
    • Jacob Vosmaer's avatar
      Use omniauth nickname as the username for LDAP · 2e6b5370
      Jacob Vosmaer authored
      Before there was a bug in omniauth-ldap which prevented samaccountname
      showing up as a possible username for new LDAP users. Thanks to upstream
      fixes, we no longer need to work around this bug.
      2e6b5370
    • Marin Jankovski's avatar
      Merge branch 'documentation/update_mr_contribution_section' into 'master' · 4af38885
      Marin Jankovski authored
      Update Contribution Guidelines: Specify Merge Request To Master
      
      There have been occasions where contributors submitted merge requests to stable branches thinking that was the way to get changes into specific releases. This results in wasted time and effort of the GitLab team responding to the merge request requesting that it be to master, as well as the developer who needs to redo the changes.
      
      This merge request very simply updates the contribution guidelines to specify that MRs should only be to master, and that getting changes into stable branches will be determined by the GitLab Team.
      
      cc @JobV
      4af38885
  2. 27 Mar, 2014 24 commits
  3. 26 Mar, 2014 13 commits