BigW Consortium Gitlab

  1. 14 Jul, 2017 1 commit
  2. 05 Jul, 2017 1 commit
  3. 28 Jun, 2017 1 commit
  4. 21 Jun, 2017 3 commits
  5. 23 May, 2017 2 commits
  6. 18 May, 2017 1 commit
  7. 15 May, 2017 1 commit
  8. 12 May, 2017 1 commit
    • Fix conflict resolution from corrupted upstream · ad2bfeb8
      Sean McGivern authored
      I don't know why this happens exactly, but given an upstream and fork repository
      from a customer, both of which required GC, resolving conflicts would corrupt
      the fork so badly that it couldn't be cloned.
      
      This isn't a perfect fix for that case, because the MR may still need to be
      merged manually, but it does ensure that the repository is at least usable.
      
      My best guess is that when we generate the index for the conflict
      resolution (which we previously did in the target project), we obtain a
      reference to an OID that doesn't exist in the source, even though we already
      fetch the refs from the target into the source.
      
      Explicitly setting the source project as the place to get the merge index from
      seems to prevent repository corruption in this way.
  9. 09 May, 2017 2 commits
  10. 03 May, 2017 1 commit
  11. 12 Apr, 2017 1 commit
  12. 11 Apr, 2017 1 commit
  13. 10 Apr, 2017 1 commit
  14. 08 Apr, 2017 3 commits
  15. 06 Apr, 2017 3 commits
  16. 05 Apr, 2017 3 commits
  17. 02 Apr, 2017 1 commit
  18. 27 Mar, 2017 1 commit
    • Only load what we need when visiting MR diffs page · 0344e083
      Sean McGivern authored
      The instance variables set in this action are only used by the JSON
      response. Visiting `merge_requests/:iid/diffs` in a browser always loads
      the `show` action, so we don't need to find an MR diff, or an
      environment, in that case.
  19. 23 Mar, 2017 8 commits
  20. 21 Mar, 2017 1 commit
  21. 02 Mar, 2017 1 commit
  22. 01 Mar, 2017 1 commit
    • Update occurrences of MWBS to MWPS · a0101ebf
      James Lopez authored
       Rename column in the database
       Rename fields related to import/export feature
       Rename API endpoints
       Rename documentation links
       Rename the rest of occurrences in the code
       Replace the images that contain the words "build succeeds" and docs referencing to them
       Make sure pipeline is green and nothing is missing.
      
      updated doc images
      
      renamed only_allow_merge_if_build_succeeds in projects and fixed references
      
      more updates
      
      fix some spec failures
      
      fix rubocop offences
      
      fix v3 api spec
      
      fix MR  specs
      
      fixed issues with partials
      
      fix MR spec
      
      fix alignment
      
      add missing v3 to v4 doc
      
      wip - refactor v3 endpoints
      
      fix specs
      
      fix a few typos
      
      fix project specs
      
      copy entities fully to V3
      
      fix  entity error
      
      more fixes
      
      fix failing specs
      
      fixed missing entities in V3 API
      
      remove comment
      
      updated code based on feedback
      
      typo
      
      fix spec
  23. 28 Feb, 2017 1 commit