1. 01 7月, 2016 1 次提交
  2. 29 6月, 2016 1 次提交
  3. 28 6月, 2016 1 次提交
  4. 25 6月, 2016 1 次提交
    • 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
  5. 24 6月, 2016 2 次提交
    • P
      66ec9255
    • Z
      Eager load award emoji on notes · e7a27946
      Z.J. van de Weg 提交于
      This commit eager loads the award emoji on both the issues and the MRs.
      When loading an issue with 108 comments this reduces the query count by
      327 queries. On a merge request with the same amount of comments this
      saves 148 queries. The large difference is not clear to me at this
      point and the total query count is still huge with 387 and 1034
      respectively. The biggest problem however, remains the calculation of
      participants.
      e7a27946
  6. 19 6月, 2016 1 次提交
  7. 11 6月, 2016 1 次提交
  8. 10 6月, 2016 4 次提交
  9. 04 6月, 2016 1 次提交
  10. 03 6月, 2016 2 次提交
  11. 02 6月, 2016 2 次提交
  12. 20 5月, 2016 1 次提交
  13. 14 5月, 2016 1 次提交
  14. 10 5月, 2016 2 次提交
  15. 09 5月, 2016 1 次提交
    • C
      Enable the Rubocop DeprecatedClassMethods cop · 9cc0937b
      Connor Shea 提交于
      This reports uses of `File.exists?` and `Dir.exists?`, which were both
      deprecated in Ruby and will eventually be removed in favor of
      `.exist?`. Also fixes all existing uses of the deprecated methods.
      9cc0937b
  16. 06 5月, 2016 2 次提交
  17. 20 4月, 2016 1 次提交
  18. 19 4月, 2016 1 次提交
  19. 13 4月, 2016 1 次提交
  20. 12 4月, 2016 2 次提交
  21. 01 4月, 2016 1 次提交
  22. 30 3月, 2016 2 次提交
  23. 29 3月, 2016 1 次提交
  24. 21 3月, 2016 1 次提交
  25. 20 3月, 2016 2 次提交
  26. 19 3月, 2016 2 次提交
  27. 16 3月, 2016 1 次提交
    • P
      Fix MergeRequest#source_sha when there is no diff · 18295585
      Pierre de La Morinerie 提交于
      `MergeRequest#source_sha` is expected to return the sha of the source
      branch last commit.
      
      But when a open Merge Request has no diff (e.g. all commits have already
      been merged to the target branch), `merge_request.source_sha`
      incorrectly returns `nil`.
      
      This was un-noticed before – but now that !2217 has been merged,
      it makes `Gitlab::Git::Commit.between` raise an
      "Unexpected nil argument" exception.
      
      This fixes the crash, by making sure that `source_sha` returns a
      correct result even when there is no diff available.
      18295585
  28. 14 3月, 2016 1 次提交