BigW Consortium Gitlab

  1. 14 Nov, 2016 1 commit
  2. 10 Nov, 2016 1 commit
  3. 07 Nov, 2016 1 commit
  4. 17 Oct, 2016 1 commit
  5. 15 Oct, 2016 1 commit
    • Fix Spinach merge request diff failures · 5a8738a7
      Stan Hu authored
      gitlab-git-test `master` was updated in ff076d88, and this caused
      the merge request diffs to change in a way that broke assumptions in the
      Spinach tests.
      
      Partial fix to #23378
  6. 13 Oct, 2016 1 commit
  7. 09 Oct, 2016 1 commit
  8. 30 Aug, 2016 1 commit
    • Fix resolving conflicts on forks · 1bda1e62
      Sean McGivern authored
      Forks may not be up-to-date with the target project, and so might not
      contain one of the parent refs in their repo. Fetch this if it isn't
      present.
  9. 25 Aug, 2016 1 commit
    • Handle non-UTF-8 conflicts gracefully · 44eb3197
      Sean McGivern authored
      These can't be resolved in the UI because if they aren't in a UTF-8
      compatible encoding, they can't be rendered as JSON. Even if they could,
      we would be implicitly changing the file encoding anyway, which seems
      like a bad idea.
  10. 12 Aug, 2016 2 commits
  11. 02 Aug, 2016 1 commit
  12. 01 Aug, 2016 1 commit
  13. 26 Jul, 2016 1 commit
  14. 18 Jul, 2016 1 commit
  15. 11 Jul, 2016 2 commits
  16. 05 Jul, 2016 1 commit
    • Improve the error message displayed when branch creation fails. · eb16e1e3
      Timothy Andrew authored
      Note: This feature was developed independently on master while this was
      in review. I've removed the conflicting bits and left the relevant
      additions, mainly a test for `Gitlab::Git::Hook`. The original commit
      message follows:
      
      1. `gitlab-shell` outputs errors to `stderr`, but we weren't using this
         information, prior to this commit. Now we capture the `stderr`, and
         display it in the flash message when branch creation fails.
      
      2. This can be used to display better errors for other git operation
         failures with small tweaks.
      
      3. The return value of `Gitlab::Git::Hook#trigger` is changed from a
         simple `true`/`false` to a tuple of `[status, errors]`. All usages
         and tests have been updated to reflect this change.
      
      4. This is only relevant to branch creation _from the Web UI_, since SSH
         and HTTP pushes access `gitlab-shell` either directly or through
         `gitlab-workhorse`.
      
      5. A few minor changes need to be made on the `gitlab-shell` end. Right
         now, the `stderr` message it outputs is prefixed by "GitLab: ", which
         shows up in our flash message. This is better removed.
  17. 30 Jun, 2016 2 commits
  18. 27 Jun, 2016 4 commits
  19. 16 Jun, 2016 2 commits
  20. 12 Jun, 2016 1 commit
    • Fix Error 500 when viewing a blob with binary characters after the 1024-byte mark · 0fdfd2dd
      Stan Hu authored
      Here was the problem:
      
      1. When determining whether a given blob is viewable text, gitlab_git reads the first 1024 bytes and checks with Linguist whether it is a text or binary file.
      2. If the blob is text, GitLab will attempt to display it.
      3. However, if the text has binary characters after the first 1024 bytes, then GitLab will attempt to load the entire contents, but the encoding will be ASCII-8BIT since there are binary characters.
      4. The Error 500 results when GitLab attempts to display a mix UTF-8 and ASCII-8BIT.
      
      To fix this, we load as much data as we are willing to display so that the detection will work properly. Requires
      an update to gitlab_git: gitlab-org/gitlab_git!86
      
      Closes #13826
  21. 04 Apr, 2016 1 commit
  22. 29 Jan, 2016 1 commit
    • Prevent transient Capybara timeouts during feature tests · bbe0fa91
      Robert Speicher authored
      The problem occurred because asset compilation takes a long time, so
      when the asset cache didn't exist and the first test ran, it would often
      (randomly) time out during the generation before the actual test even
      had a chance to run.
      
      Now we check if the cache exists before the suite runs, and if not, we
      manually fire a request to the root URL in order to generate it. This
      should allow subsequent tests to use the cached assets.
  23. 08 Dec, 2015 1 commit
  24. 07 Dec, 2015 1 commit
  25. 04 Dec, 2015 1 commit
  26. 03 Nov, 2015 1 commit
  27. 13 Oct, 2015 1 commit
  28. 14 Aug, 2015 3 commits
  29. 26 Jul, 2015 1 commit
  30. 24 Jul, 2015 1 commit
  31. 21 Jul, 2015 1 commit