- 19 Aug, 2016 2 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
- 17 Aug, 2016 2 commits
-
-
Connor Shea authored
-
Douwe Maan authored
-
- 16 Aug, 2016 1 commit
-
-
Douwe Maan authored
-
- 12 Aug, 2016 2 commits
-
-
Sean McGivern authored
An MR can only be resolved in the UI if: - It has conflicts. - It has valid diff_refs (in other words, it supports new diff notes). - It has no conflicts with one side missing. - It has no conflicts in binary files. - It has no conflicts in files too large to display. - It has no conflicts containing invalid conflict markers.
-
Douwe Maan authored
-
- 02 Aug, 2016 1 commit
-
-
Paco Guzman authored
Speedup DiffNote#active? on discussions, preloading noteables and avoid touching git repository to return diff_refs when possible - Preloading noteable we share the same noteable instance when more than one discussion refers to the same noteable. - Any other call to that object that is cached in that object will be for any discussion. - In those cases where merge_request_diff has all the sha stored to build a diff_refs get that diff_refs using directly those sha instead accessing to the git repository to first get the commits and later the sha.
-
- 29 Jul, 2016 1 commit
-
-
Douwe Maan authored
-
- 26 Jul, 2016 3 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
- 07 Jul, 2016 5 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-