- 12 May, 2017 1 commit
-
-
Sean McGivern authored
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.
-
- 11 May, 2017 18 commits
-
-
Achilleas Pipinellis authored
Update getting_started_part_one.md. See merge request !11020
-
Achilleas Pipinellis authored
Fix a broken link for the "How to Configure LDAP with GitLab EE" article See merge request !11114
-
Achilleas Pipinellis authored
Update README.md with Authentication projects example See merge request !11162
-
Sean McGivern authored
Fix MySQL build failure Closes #32106 See merge request !11277
-
Filipa Lacerda authored
Fix slash commands detection in comments Closes #32016 See merge request !11265
-
Kushal Pandya authored
-
Phil Hughes authored
Remove sidebar bundle spec Closes #32045 See merge request !11223
-
Sean McGivern authored
Issue API change: assignee_id parameter and assignee object in a response See merge request !11271
-
Sean McGivern authored
Implement auxiliary blob viewers See merge request !11195
-
Phil Hughes authored
Fix flickering of system notes Closes #32087 See merge request !11281
-
Phil Hughes authored
Merge branch '31625-tag-editor-loses-all-inputs-when-you-try-to-add-a-tag-that-already-exists' into 'master' Resolve "Tag editor loses all inputs when you try to add a tag that already exists" Closes #31625 See merge request !11155
-
Phil Hughes authored
Fix aria labels on custom notifications modal Closes #32094 See merge request !11256
-
Eric Eastwood authored
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32087 Easy reproduction: 1. Edit an issue title 1. Notice the system note added 1. Switch to another tab and back (to fire the polling immediately) 1. Notice the flicker (without this fix)
-
Douwe Maan authored
-
Douwe Maan authored
Find the nothing-here-block before asserting page content when on explore page of shortcuts_spec.rb See merge request !11250
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
- 10 May, 2017 21 commits
-
-
Marcia Ramos authored
Hide GCP install guide from index page until our image is released Closes omnibus-gitlab#2326 See merge request !11213
-
Regis Boudinot authored
Retried in database Closes #25737 See merge request !11115
-
Clement Ho authored
Track pending requests in AjaxCache See merge request !11170
-
Winnie Hellmann authored
-
Kamil Trzciński authored
Make all Serializers receive `current_user` instead `user` [CE] See merge request !11254
-
Robert Speicher authored
Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063
-
Sam Rose authored
-
Valery Sizov authored
-
Achilleas Pipinellis authored
Add "API" to API docs Closes #32105 See merge request !11261
-
Clement Ho authored
-
Achilleas Pipinellis authored
# Conflicts: # doc/install/README.md
-
Marcia Ramos authored
-
Robert Speicher authored
Security patches -> `master` See merge request !11230
-
Oswaldo Ferreira authored
-
Sam Rose authored
-
Phil Hughes authored
Merge branch '31474-issue-boards-sidebar-milestone-dropdown-should-not-be-multi-select' into 'master' Resolve "Issue boards sidebar milestone dropdown should not be multi select" Closes #31474 See merge request !11084
-
Douwe Maan authored
Post-deploy to clean `pending_delete` projects Closes #20984 See merge request !11044
-
Filipa Lacerda authored
Fixed the stage title translation in cycle analytics See merge request !11252
-
Phil Hughes authored
Center all empty states Closes #30949 See merge request !11249
-
Annabel Dunstone Gray authored
-
Filipa Lacerda authored
Center related merge request items horizontally See merge request !11163
-