1. 22 Nov, 2017 1 commit
  2. 21 Nov, 2017 4 commits
  3. 20 Nov, 2017 3 commits
    • Douwe Maan's avatar
      Merge branch 'fix-conflict-highlighting' into 'master' · 370cbbdf8713
      Douwe Maan authored
      Fix conflict highlighting
      
      See merge request gitlab-org/gitlab-ce!15463
      
      (cherry picked from commit 202ab62874bb3d828ab48017550660d461e8cf6b)
      
      64a9e53b Fix conflict highlighting
      370cbbdf8713
    • Rémy Coutable's avatar
      Merge branch... · 67ec6408088e
      Rémy Coutable authored
      Merge branch '40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use' into 'master'
      
      Fix Gitlab::Git::Repository#remote_tags using unexisting variable
      
      Closes #40300
      
      See merge request gitlab-org/gitlab-ce!15466
      
      (cherry picked from commit c563661f910934f1103690d46f9af8a75423077d)
      
      63beaa32 Fix Gitlab::Git::Repository#remote_tags using unexisting variable
      d622a8c5 Merge branch 'master' into 40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use
      67ec6408088e
    • Douwe Maan's avatar
      Merge branch 'bvl-fix-count-with-selects' into 'master' · 385d6af5e099
      Douwe Maan authored
      Remove the selects when counting the last page
      
      Closes #40266
      
      See merge request gitlab-org/gitlab-ce!15456
      
      (cherry picked from commit c406824d319e5b1a073af7cf55c3f24bfa66e2a4)
      
      5a335c4d Remove the selects when counting the last page
      385d6af5e099
  4. 17 Nov, 2017 4 commits
    • Douwe Maan's avatar
      Merge branch 'fix/git-env-repo-paths' into 'master' · 653c04f7ed4b
      Douwe Maan authored
      Use relative git object paths to construct absolute ones before setting Env
      
      See merge request gitlab-org/gitlab-ce!15376
      
      (cherry picked from commit fcd721d3f6bd)
      
      cc891e6276c5 Use relative git object paths to construct absolute ones before setting Env
      653c04f7ed4b
    • Douwe Maan's avatar
      Merge branch... · 8ca76440b536
      Douwe Maan authored
      Merge branch '40230-groups-gitlab-org-labels-json-redirects-to-groups-gitlab-org-labels-json' into 'master'
      
      Resolve "/groups/gitlab-org/labels.json redirects to /groups/gitlab-org/-/labels/.json"
      
      Closes #40230
      
      See merge request gitlab-org/gitlab-ce!15427
      
      (cherry picked from commit 7142af49fa5947d439c1c539140538fc740f5187)
      
      9f921b73 Don't add a trailing slash in group redirects
      8ca76440b536
    • Sean McGivern's avatar
      Merge branch 'dm-go-get-blank-enabled-protocol' into 'master' · 6825dd826472
      Sean McGivern authored
      Fix go-import meta data when enabled_git_access_protocol is a blank string
      
      Closes #40256
      
      See merge request gitlab-org/gitlab-ce!15448
      
      (cherry picked from commit 69dd59aec9e5f8959fa36eb74db28d71aad4212b)
      
      f767dd4a Fix go-import meta data when enabled_git_access_protocol is a blank string
      6825dd826472
    • Sean McGivern's avatar
      Merge branch 'sh-background-migration-move-mr-diff-id' into 'master' · 260c2e5d7ac0
      Sean McGivern authored
      Convert migration to populate latest merge request ID into a background migration
      
      See merge request gitlab-org/gitlab-ce!15440
      
      (cherry picked from commit 2dff37762f76b195d6b36d73dab544d0ec5e6c83)
      
      5cecff89 Convert migration to populate latest merge request ID into a background migration
      260c2e5d7ac0
  5. 16 Nov, 2017 1 commit
  6. 15 Nov, 2017 3 commits
  7. 14 Nov, 2017 1 commit
  8. 10 Nov, 2017 2 commits
  9. 09 Nov, 2017 7 commits
  10. 07 Nov, 2017 14 commits