1. 09 Feb, 2018 4 commits
    • Lin Jen-Shin's avatar
      Merge remote-tracking branch 'upstream/master' into qa-clone-with-deploy-key · 09a3b8fb
      Lin Jen-Shin authored
      * upstream/master: (466 commits)
        Set initial password for instance in LDAP QA test
        Backport EE changes to some hashed storage documentation to CE
        Remove allow_n_plus_1 from Git::Repository#branches_filter
        Bumps Gitlab Shell version to 6.0.3
        Make resetting column information overridable in EE
        Added 'clear' button to ci lint editor
        Issues and merge requests in subgroups docs
        Update docs labels CE
        Refactored merge_requests/show path in dispatcher.js
        wording
        don't check against a hardcoded user name
        10.5 Update the dependencies license list
        10.5 Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates
        Create update guide for 10.5
        Update 10.5 source install guide
        Add docs for MR link in commit page
        Add groups to OpenID Connect claims
        Replaced $.get with axois.get
        Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitaly
        Update style_guide_scss.md
        ...
      09a3b8fb
    • Grzegorz Bizon's avatar
      Merge branch 'sh-ldap-set-first-password-qa' into 'master' · 7534f7a8
      Grzegorz Bizon authored
      Set initial password for instance in LDAP QA test
      
      See merge request gitlab-org/gitlab-ce!17024
      7534f7a8
    • Stan Hu's avatar
      Merge branch '42896-hashed-storage-beta-docs' into 'master' · fa0923dd
      Stan Hu authored
      Resolve "Hashed storage is now beta"
      
      Closes #42896
      
      See merge request gitlab-org/gitlab-ce!17015
      fa0923dd
    • Stan Hu's avatar
      Set initial password for instance in LDAP QA test · 589f6b19
      Stan Hu authored
      For a new instance, the root password needs to be set, regardless of whether
      LDAP is enabled.
      589f6b19
  2. 08 Feb, 2018 36 commits