1. 23 Nov, 2017 12 commits
    • Yorick Peterse's avatar
      Merge branch 'fix-ci-pipelines-index' into 'master' · a86fcfb1f28d
      Yorick Peterse authored
      Update composite pipelines index to include "id"
      
      See merge request gitlab-org/gitlab-ce!15519
      a86fcfb1f28d
    • Rémy Coutable's avatar
      Merge branch 'branch-exists-redis' into 'master' · 84f793be8da8
      Rémy Coutable authored
      Use Redis cache for branch existence checks
      
      Closes #40349
      
      See merge request gitlab-org/gitlab-ce!15513
      
      (cherry picked from commit e2e4d18f1c468db8d76aaea1eb1d8442b196244b)
      
      82e9bf29 Use Redis cache for branch existence checks
      59fbefbd Add caching test
      595631d2 refactor tests
      f3156232 apply Rémy's patch
      84f793be8da8
    • Douwe Maan's avatar
      Merge branch '40367-tagspage-tags' into 'master' · dd106868e02e
      Douwe Maan authored
      Resolve "TagsPage|Tags"
      
      Closes #40367
      
      See merge request gitlab-org/gitlab-ce!15512
      
      (cherry picked from commit 9024875e1f81a3aab3c0879d33a4cea912ce833d)
      
      3a70800f Use the correct i18n helper for namespaced string
      dd106868e02e
    • Sean McGivern's avatar
      Merge branch '1870-impersonation-stuck-on-password-change-ce' into 'master' · c064411121d6
      Sean McGivern authored
      [CE] Impersonation no longer gets stuck on password change.
      
      Closes #13888
      
      See merge request gitlab-org/gitlab-ce!15497
      
      (cherry picked from commit 340a5e70a24089d0cc1523d51e0bd9e070af06ab)
      
      053a1988 Impersonation no longer gets stuck on password change.
      ef562690 Fix MR IID in changelog item
      c064411121d6
    • Douwe Maan's avatar
      Merge branch '40292-bitbucket-import-hashed-storage' into 'master' · b01693ba6541
      Douwe Maan authored
      Fix bitbucket wiki import with hashed storage enabled
      
      Closes #40292
      
      See merge request gitlab-org/gitlab-ce!15490
      
      (cherry picked from commit c043ba67c2d6a9493518408fd198dea30ce6cfcb)
      
      f2977c63 Fix bitbucket wiki import with hashed storage enabled
      b01693ba6541
    • Sean McGivern's avatar
      Merge branch 'issue_40337' into 'master' · 0990d308618d
      Sean McGivern authored
      Fix promoting milestone updating all issuables without milestone
      
      Closes #40337
      
      See merge request gitlab-org/gitlab-ce!15487
      
      (cherry picked from commit 65545099554f97a30c66c2c8c36d24c589daddc3)
      
      3f6e45ed Fix promoting milestone updating all issuables without milestone
      0990d308618d
    • Douwe Maan's avatar
      Merge branch 'bvl-dont-move-projects-using-hashed-storage' into 'master' · d93d44541872
      Douwe Maan authored
      Don't move project repository/attachments when using hashed storage
      
      Closes #40289
      
      See merge request gitlab-org/gitlab-ce!15479
      
      (cherry picked from commit bd026b6a28ac410ad455b7b915cafc9782296b6b)
      
      fa39e8a0 Don't move project repository/attachments when using hashed storage
      d93d44541872
    • Robert Speicher's avatar
      Merge branch 'grpc-update' into 'master' · b7b3245a6150
      Robert Speicher authored
      Update gRPC to v1.7.2
      
      Closes gitaly#742
      
      See merge request gitlab-org/gitlab-ce!15439
      
      (cherry picked from commit 9a8f094e34e9f6da5932f239a510abcd996a79b3)
      
      473ae04d Update gRPC to v1.7.2
      b7b3245a6150
    • Filipa Lacerda's avatar
      Merge branch 'backport-3434' into 'master' · 77571214b66b
      Filipa Lacerda authored
      Backport ability to enable/disable file attachments in issuable form
      
      See merge request gitlab-org/gitlab-ce!15433
      
      (cherry picked from commit ea07773d81b82ca8d263e63b6ec245cfc2be282b)
      
      24d6c935 Backport ability to enable/disable file attachments in issuable form
      4f828bce Use mountComponent instead of nextTick
      49adbe8c Code review changes
      cff048b6 Update toolbar_spec.js
      77571214b66b
    • Sean McGivern's avatar
      Merge branch 'osw-merge-process-logs' into 'master' · 62ccec99a53a
      Sean McGivern authored
      Add logs for monitoring the merge process
      
      See merge request gitlab-org/gitlab-ce!15425
      
      (cherry picked from commit 190ea021cd1fd89d20c9548a72034a7b941413ca)
      
      76155df4df21 Add logs for monitoring the merge process
      73ee2f97818b Add MR reference to logs
      62ccec99a53a
    • Sean McGivern's avatar
      Merge branch '39167-async-boards-sidebar' into 'master' · fdf23ba0fddc
      Sean McGivern authored
      Make Issue Boards sidebar subscriptions async
      
      Closes #39167 and #40094
      
      See merge request gitlab-org/gitlab-ce!15364
      
      (cherry picked from commit 7a61a8e09bcab5e0cb37ddb13900a5c07ef18918)
      
      d2699aea Add issue sidebar and toggle_subscription endpoint in board issues data
      f494dbc5 Async notification subscriptions in issue boards
      fdf23ba0fddc
    • Sean McGivern's avatar
      Merge branch '39461-notes-api-for-issues-no-longer-returns-label-additions-removals' into 'master' · 008937a9c8b0
      Sean McGivern authored
      Resolve "Notes API for issues no longer returns label additions/removals"
      
      Closes #39461
      
      See merge request gitlab-org/gitlab-ce!15080
      
      (cherry picked from commit f562e69eab0d7bac8ea20d29c3df981289dd8cdb)
      
      38ffd1bc7b87 fix the commit reference pattern from matching other entities
      b44999acfa67 try to fix the failing spec on external refs
      445273512a49 reverting to the simpler approach
      0922444ffcff fix the linting error
      8acad6cd0631 add the missing spec
      bc6b9a624669 add `#with_metadata` scope to remove a N+1 from the notes' API
      008937a9c8b0
  2. 22 Nov, 2017 5 commits
  3. 21 Nov, 2017 8 commits
  4. 20 Nov, 2017 5 commits
    • Winnie Hellmann's avatar
      Update VERSION to 10.2.0-rc4 · 06d6c694ba83
      Winnie Hellmann authored
      06d6c694ba83
    • 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
    • Stan Hu's avatar
      Merge branch '4056-hashed-storage-upload-transfers' into 'master' · a637ca3d7a01
      Stan Hu authored
      Fix project transfer with hashed-storage attachments
      
      Closes gitlab-ee#4056
      
      See merge request gitlab-org/gitlab-ce!15457
      
      (cherry picked from commit 121508f81fec8773af37a345abb6c33b7a3c4518)
      
      9b3b0f02 Fix project transfer with hashed-storage attachments
      a637ca3d7a01
  5. 17 Nov, 2017 10 commits
    • Michael Kozono's avatar
      Update VERSION to 10.2.0-rc3 · 40ff35fc2e61
      Michael Kozono authored
      40ff35fc2e61
    • Winnie Hellmann's avatar
      Merge branch '10-2-stable-prepare-rc3' into '10-2-stable' · ee50be840c41
      Winnie Hellmann authored
      Prepare 10.2 RC3 release
      
      See merge request gitlab-org/gitlab-ce!15404
      ee50be840c41
    • 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
    • Nick Thomas's avatar
      Merge branch 'sh-port-hashed-storage-transfer-fix' into 'master' · 9c4cf2d2b3e5
      Nick Thomas authored
      Fix hashed storage with project transfers to another namespace
      
      Closes gitlab-ee#4056
      
      See merge request gitlab-org/gitlab-ce!15444
      
      (cherry picked from commit 76b2a7caa5219662a29f0eb16f0507aac1976f33)
      
      0c085aaf Fix hashed storage with project transfers to another namespace
      9c4cf2d2b3e5
    • Kamil Trzciński's avatar
      Merge branch 'ci-pipeline-status-query' into 'master' · 23b52a6f21f5
      Kamil Trzciński authored
      Optimise getting the pipeline status of commits
      
      See merge request gitlab-org/gitlab-ce!15332
      
      (cherry picked from commit 6d36c3b5de7772415b1176b8247c34053b826a74)
      
      ab16a6fb Optimise getting the pipeline status of commits
      23b52a6f21f5
    • 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
    • Rémy Coutable's avatar
      Merge branch 'dm-avatarable-with-asset-host' into 'master' · dbf7e8bcc24d
      Rémy Coutable authored
      Always return full avatar URL for private/internal groups/projects when asset host is set
      
      See merge request gitlab-org/gitlab-ce!15288
      
      (cherry picked from commit ae8118994e8a)
      
      0cf25867 Always return full avatar URL for private/internal groups/projects when asset host is set
      d4babd26 Remove specs that are testing behavior already tested in Avatarable unit tests
      dbf7e8bcc24d
    • Winnie Hellmann's avatar
      Merge branch 'fix/sm/fix-condeclimate-version' into 'master' · ccf738413d8d
      Winnie Hellmann authored
      Set 0.69.0 instead of latest for codeclimate image
      
      See merge request gitlab-org/gitlab-ce!15445
      
      (cherry picked from commit 10c216dabb44605d5e8711a0158e3087289e8889)
      
      06c9327c Set 0.69.0 instead of latest for codeclimate image
      ccf738413d8d