- 12 May, 2017 40 commits
-
-
Douwe Maan authored
Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298
-
Filipa Lacerda authored
New branch new mr docs See merge request !11308
-
Victor Wu authored
-
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.
-
Robert Speicher authored
Usage ping updates Closes #31741 and #31453 See merge request !11231
-
Douwe Maan authored
Improve project list cache key Closes #31863 See merge request !11325
-
Sean McGivern authored
Autolink package names in Gemfile See merge request !11224
-
Sean McGivern authored
Paste a copied MR source branch name as code when pasted into a GFM form See merge request !11315
-
Clement Ho authored
Removed all instances of Object.assign by using es6 classes, also includes some … See merge request !11288
-
Luke "Jared" Bennett authored
-
Douwe Maan authored
Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries See merge request !10981
-
Douwe Maan authored
Only rename namespaces and projects with an invalid path See merge request !11338
-
Douwe Maan authored
# Conflicts: # app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
-
Douwe Maan authored
-
Douwe Maan authored
-
Sean McGivern authored
Consistently use monospace font for commit SHAs and branch and tag names See merge request !11276
-
Pawel Chojnacki authored
-
James Lopez authored
-
Douwe Maan authored
Fix form_spec.rb See merge request !11330
-
Bob Van Landuyt authored
For exact matches, not namespaces that end with an invalid path
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Douwe Maan authored
-
Sean McGivern authored
Fix milestone_filter_spec.rb See merge request !11329
-
Douwe Maan authored
-
Annabel Dunstone Gray authored
Merge branch '31384-new-issue-button-on-no-results-page-after-search-doesn-t-go-to-correct-form' into 'master' Remove 'New Issue' button from 'There are no issues to show' state graphic Closes #31384 See merge request !11263
-
Stan Hu authored
Fix failing backup filename spec for RCs See merge request !11318
-
Luke "Jared" Bennett authored
-
Kamil Trzciński authored
Adds pipeline id to 'Last Pipeline' link in pipeline schedules Closes #32103 See merge request !11258
-
Sean McGivern authored
Rework update_assignee_cache_counts Closes #31873 See merge request !11270
-
Filipa Lacerda authored
MRWidget: Fix target branch link. See merge request !11267
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Sean McGivern authored
Enabled 'no one' as a merge access level in protected branches Closes #31541 See merge request !11232
-
Fatih Acet authored
Add "SHA mismatch" state to the MR widget Closes #32178 See merge request !11316
-
Luke "Jared" Bennett authored
-
Sean McGivern authored
Backport FileFinder from EE Closes #32188 See merge request !11319
-
Phil Hughes authored
Uniform CI status components in vue Closes #30286 See merge request !11235
-
Filipa Lacerda authored
-
Luke "Jared" Bennett authored
-
Valery Sizov authored
-