1. 23 Nov, 2017 4 commits
    • 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 17 commits
  6. 16 Nov, 2017 1 commit