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