| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | use actual head pipeline on merge request presenter | Felipe Artur | 2017-12-05 | 1 | -1/+1 |
| | | |||||
| * | Reduce method calls while evaluating Projects::MergeRequestsController#show.json36876-mr-show-json-controller-perf-improvements | Oswaldo Ferreira | 2017-10-04 | 1 | -0/+4 |
| | | |||||
| * | Change all `:empty_project` to `:project`rs-empty_project-default | Robert Speicher | 2017-08-02 | 1 | -2/+2 |
| | | |||||
| * | Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanup | Robert Speicher | 2017-08-01 | 1 | -1/+1 |
| | | |||||
| * | Fix spec name grammermr-branch-link-use-tree | Clement Ho | 2017-07-12 | 1 | -3/+3 |
| | | |||||
| * | Make commits behind text a link to the target branch commits page | Clement Ho | 2017-07-11 | 1 | -0/+24 |
| | | |||||
| * | Convert target branch link to use tree | Clement Ho | 2017-07-11 | 1 | -3/+3 |
| | | |||||
| * | MR branch link now links to tree instead of commits | Clement Ho | 2017-07-10 | 1 | -0/+13 |
| | | |||||
| * | Display issue state in issue links section of merge request widget33381-display-issue-state-in-mr-widget-issue-links | Adam Niedzielski | 2017-06-09 | 1 | -0/+10 |
| | | |||||
| * | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-repos | Sean McGivern | 2017-05-12 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way. | ||||
| * | Merge request widget redesign | Fatih Acet | 2017-05-09 | 1 | -0/+356 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |