1. 26 Jun, 2017 5 commits
  2. 21 Jun, 2017 8 commits
  3. 19 Jun, 2017 1 commit
  4. 16 Jun, 2017 2 commits
    • Sean McGivern's avatar
      Add table for files in merge request diffs · 9a73b634
      Sean McGivern authored
      This adds an ID-less table containing one row per file, per merge request
      diff. It has a column for each attribute on Gitlab::Git::Diff that is serialised
      currently, with the advantage that we can easily query the attributes of this
      new table.
      
      It does not migrate existing data, so we have fallback code when the legacy
      st_diffs column is present instead. For a merge request diff to be valid, it
      should have at most one of:
      
      * Rows in this new table, with the correct merge_request_diff_id.
      * A non-NULL st_diffs column.
      
      It may have neither, if the diff is empty.
      9a73b634
    • Felipe Artur's avatar
  5. 15 Jun, 2017 2 commits
    • Sean McGivern's avatar
      Deserialise existing custom notification settings · e94c1028
      Sean McGivern authored
      Create a post-deployment migration to update all existing notification settings
      with at least one custom level enabled to the new format. Also handle the same
      conversion when updating settings, to catch any stragglers.
      e94c1028
    • Sean McGivern's avatar
      Add columns for custom notification settings · f4b5fcbc
      Sean McGivern authored
      Add columns for each custom notification level, defaulting to null. Read from
      those columns if non-null, otherwise fall back to the serialized column. Writing
      will write to the new column if `events` isn't manually set.
      f4b5fcbc
  6. 14 Jun, 2017 1 commit
  7. 13 Jun, 2017 1 commit
  8. 08 Jun, 2017 2 commits
    • DJ Mountney's avatar
      Bring in security changes from the 9.2.5 release · 565ead61
      DJ Mountney authored
      Ran:
       - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
       - git checkout -b 9-2-5-security-patch origin/v9.2.2
       - git apply patchfile.patch
       - git commit
       - [Got the sha ref for the commit]
       - git checkout -b upstream-9-2-security master
       - git cherry-pick <SHA of the patchfile commit>
       - [Resolved conflicts]
       - git cherry-pick --continue
      565ead61
    • DJ Mountney's avatar
      Bring in security changes from the 9.2.5 release · 1d1363e2
      DJ Mountney authored
      Ran:
       - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
       - git checkout -b 9-2-5-security-patch origin/v9.2.2
       - git apply patchfile.patch
       - git commit
       - [Got the sha ref for the commit]
       - git checkout -b upstream-9-2-security master
       - git cherry-pick <SHA of the patchfile commit>
       - [Resolved conflicts]
       - git cherry-pick --continue
      1d1363e2
  9. 07 Jun, 2017 1 commit
  10. 06 Jun, 2017 9 commits
  11. 05 Jun, 2017 7 commits
  12. 02 Jun, 2017 1 commit