An error occurred fetching the project authors.
- 19 Aug, 2016 1 commit
-
-
Douwe Maan authored
-
- 17 Aug, 2016 1 commit
-
-
Douwe Maan authored
-
- 12 Aug, 2016 7 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
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.
-
Sean McGivern authored
-
Kamil Trzcinski authored
-
Z.J. van de Weg authored
-
- 11 Aug, 2016 3 commits
-
-
Z.J. van de Weg authored
-
Z.J. van de Weg authored
-
Scott Le authored
DRY code + fix rubocop Add more test cases Append to changelog DRY changes list find_url service for merge_requests use GET for getting merge request links remove files rename to get_url_service reduce loop add test case for cross project refactor tiny thing update changelog
-
- 03 Aug, 2016 6 commits
-
-
Paco Guzman authored
-
Douwe Maan authored
-
Paco Guzman authored
So we have raw_diffs too
-
Paco Guzman authored
This object will manage Gitlab::Git::Compare instances
-
Paco Guzman authored
Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
-
Paco Guzman authored
Introducing the concept of SafeDiffs which relates diffs with UI highlighting.
-
- 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.
-
- 31 Jul, 2016 2 commits
-
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
When importing a pull request from GitHub, the old and new branches may no longer actually exist by those names, but we need to recreate the merge request diff with the right source and target shas. We use these `target_branch_sha` and `source_branch_sha` attributes to force these to the intended values. But the reader methods were always looking up to the target/source branch head instead of check if these values was previously set.
-
- 29 Jul, 2016 2 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
- 26 Jul, 2016 1 commit
-
-
Douwe Maan authored
-
- 18 Jul, 2016 1 commit
-
-
Rémy Coutable authored
This reverts commit 530f5158. See !4892. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
- 13 Jul, 2016 4 commits
-
-
Robert Speicher authored
This reverts commit 9ca633eb, reversing changes made to fb229bbf.
-
Timothy Andrew authored
1. If they are a developer with "Developers can Merge" switched on.
-
Timothy Andrew authored
1. Don't use case statements for dispatch anymore. This leads to a lot of duplication, and makes the logic harder to follow. 2. Remove duplicated logic. - For example, the `can_push_to_branch?` exists, but we also have a different way of checking the same condition within `change_access_check`. - This kind of duplication is removed, and the `can_push_to_branch?` method is used in both places. 3. Move checks returning true/false to `UserAccess`. - All public methods in `GitAccess` now return an instance of `GitAccessStatus`. Previously, some methods would return true/false as well, which was confusing. - It makes sense for these kinds of checks to be at the level of a user, so the `UserAccess` class was repurposed for this. The prior `UserAccess.allowed?` classmethod is converted into an instance method. - All external uses of these checks have been migrated to use the `UserAccess` class 4. Move the "change_access_check" into a separate class. - Create the `GitAccess::ChangeAccessCheck` class to run these checks, which are quite substantial. - `ChangeAccessCheck` returns an instance of `GitAccessStatus` as well. 5. Break out the boolean logic in `ChangeAccessCheck` into `if/else` chains - this seems more readable. 6. I can understand that this might look like overkill for !4892, but I think this is a good opportunity to clean it up. - http://martinfowler.com/bliki/OpportunisticRefactoring.html
-
Mathias Vestergaard authored
- Cherry-picked from `mvestergaard:branch-protection-dev-merge` - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4220
-
- 08 Jul, 2016 2 commits
-
-
Paco Guzman authored
-
Sean McGivern authored
When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
-
- 06 Jul, 2016 7 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
- 05 Jul, 2016 2 commits
-
-
Patricio Cano authored
-
Patricio Cano authored
-