BigW Consortium Gitlab

  1. 11 Nov, 2016 1 commit
  2. 04 Nov, 2016 2 commits
  3. 20 Oct, 2016 1 commit
  4. 14 Oct, 2016 1 commit
  5. 13 Oct, 2016 5 commits
    • Add JSON Schema · 7529bbae
      Sean McGivern authored
    • Make RuboCop happy · 9727366b
      Sean McGivern authored
    • Allow setting content for resolutions · 3f71c43e
      Sean McGivern authored
      When reading conflicts:
      
      1. Add a `type` field. `text` works as before, and has `sections`;
         `text-editor` is a file with ambiguous conflict markers that can only
         be resolved in an editor.
      2. Add a `content_path` field pointing to a JSON representation of the
         file's content for a single file.
      3. Hitting `content_path` returns a similar datastructure to the `file`,
         but without the `content_path` and `sections` fields, and with a
         `content` field containing the full contents of the file (with
         conflict markers).
      
      When writing conflicts:
      
      1. Instead of `sections` being at the top level, they are now in a
         `files` array. This matches the read format better.
      2. The `files` array contains file hashes, each of which must contain:
         a. `new_path`
         b. `old_path`
         c. EITHER `sections` (which works as before) or `content` (with the
            full content of the resolved file).
  6. 10 Oct, 2016 1 commit
  7. 07 Oct, 2016 1 commit
  8. 06 Oct, 2016 1 commit
  9. 03 Oct, 2016 1 commit
  10. 08 Sep, 2016 1 commit
  11. 30 Aug, 2016 2 commits
    • Improve grammar · 6b02c82c
      Katarzyna Kobierska authored
    • User can edit closed MR with deleted fork · c9c2503c
      Katarzyna Kobierska authored
      Add test for closed MR without fork
      
      Add view test visibility of Reopen and Close buttons
      
      Fix controller tests and validation method
      
      Fix missing space
      
      Remove unused variables from test
      
      closed_without_fork? method refactoring
      
      Add information about missing fork
      
      When closed MR without fork can't edit target branch
      
      Tests for closed MR edit view
      
      Fix indentation and rebase, refactoring
  12. 12 Aug, 2016 7 commits
  13. 09 Aug, 2016 1 commit
  14. 03 Aug, 2016 2 commits
  15. 11 Jul, 2016 1 commit
  16. 08 Jul, 2016 2 commits
  17. 06 Jul, 2016 2 commits
  18. 01 Jul, 2016 1 commit
  19. 28 Jun, 2016 1 commit
  20. 27 Jun, 2016 1 commit
  21. 24 Jun, 2016 1 commit
    • Fix a wrong MR status when merge_when_build_succeeds &… · e3d464d8
      Rémy Coutable authored
      Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true
      
      The issue was that `MergeRequest#mergeable?` returns false when the CI
      state is not success and project.only_allow_merge_if_build_succeeds is
      true. In this case `Projects::MergeRequestsController#merge` would
      return the `:failed` status when enabling `merge_when_build_succeeds`,
      thus leading to a weird state and the MR never automatically merged.
      
      The fix is to disable the CI state check in the controller safeguard
      that early return the `:failed` status.
      Signed-off-by: 's avatarRémy Coutable <remy@rymai.me>
  22. 03 Jun, 2016 4 commits