1. 02 7月, 2016 1 次提交
  2. 28 6月, 2016 2 次提交
  3. 25 6月, 2016 2 次提交
    • R
      Validate presence of essential params for diff rendering · 7627cc19
      Ruben Davila 提交于
      This will avoid application errors generated by the assumption of the
      presence of these params.
      7627cc19
    • R
      Fix a wrong MR status when merge_when_build_succeeds &... · e3d464d8
      Rémy Coutable 提交于
      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: NRémy Coutable <remy@rymai.me>
      e3d464d8
  4. 20 6月, 2016 1 次提交
  5. 18 6月, 2016 2 次提交
  6. 17 6月, 2016 4 次提交
  7. 16 6月, 2016 2 次提交
  8. 15 6月, 2016 1 次提交
  9. 14 6月, 2016 5 次提交
  10. 12 6月, 2016 1 次提交
    • S
      Fix Error 500 when viewing a blob with binary characters after the 1024-byte mark · 0fdfd2dd
      Stan Hu 提交于
      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
      0fdfd2dd
  11. 07 6月, 2016 1 次提交
  12. 06 6月, 2016 3 次提交
  13. 04 6月, 2016 1 次提交
  14. 03 6月, 2016 4 次提交
  15. 02 6月, 2016 1 次提交
    • S
      Don't allow merges with new commits · f680eca9
      Sean McGivern 提交于
      Set a `sha` parameter on the MR form. If this doesn't match the HEAD of
      the source branch when the form is submitted, show a warning (like with
      a merge conflict) and don't merge the branch.
      f680eca9
  16. 01 6月, 2016 1 次提交
  17. 30 5月, 2016 1 次提交
  18. 25 5月, 2016 1 次提交
  19. 24 5月, 2016 1 次提交
  20. 18 5月, 2016 1 次提交
  21. 12 5月, 2016 2 次提交
  22. 10 5月, 2016 1 次提交
  23. 01 5月, 2016 1 次提交