gitlab-org--gitlab-foss/changelogs/unreleased
Stan Hu 8cdd3a6b54 Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error' into 'master'
Resolve "Error 500 while attempting to resolve conflicts due to UTF-8 conversion error"

Closes #44564

See merge request gitlab-org/gitlab-ce!17962
2018-03-23 19:19:55 +00:00
..
.gitkeep
31114-internal-ids-are-not-atomic.yml
34604-fix-generated-url-for-external-repository.yml
35475-lazy-diff.yml
39584-nesting-depth-5-framework-dropdowns.yml Apply NestingDepth (level 5) (framework/dropdowns.scss) 2018-03-21 08:51:17 +09:00
41902-add-api-option-to-overwrite-project-description-on-project-export.yml
42037-long-instance-names-group-names-covers-namespace-dropdown.yml Prevent overflow of long instance urls during Project creation 2018-03-22 14:42:51 +00:00
42579-fix-sidebar-dropdown-hover-style.yml
42880-loss-of-input-text-on-comments-after-preview.yml Resolve "Loss of input text on comments after preview" 2018-03-20 17:02:41 +00:00
43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-information.yml
43525-limit-number-of-failed-logins-using-ldap.yml Writes specs 2018-03-22 16:05:15 +00:00
43702-update-label-dropdown-wording.yml
43717-breadcrumb-on-admin-runner-page.yml
43720-update-fe-webpack-docs.yml
43771-improve-avatar-error-message.yml Change avatar error message to include allowed file formats 2018-03-22 19:01:43 +01:00
43786-on-the-issuable-list-add-tooltips-to-icons.yml Issuable list: add tooltips to icons 2018-03-21 16:27:19 +00:00
43805-list-gitaly-calls-and-arguments-in-the-performance-bar.yml
43806-update-ruby-saml-to-1-7-2.yml
43933-always-notify-mentions.yml Always notify new mentions even if explicitly unsubscribed 2018-03-19 12:13:03 -06:00
43949-verify-job-artifacts.yml
44022-singular-1-diff.yml
44139-fix-issue-boards-dup-keys.yml
44160-update-foreman-to-0-84-0.yml
44191-reduce-redis-usage-from-merge-request-diffs-caching.yml
44218-add-internationalization-support-for-the-prometheus-merge-request-widget.yml Add i18n support for the mrWidget prometheus memory widget 2018-03-23 11:35:15 -06:00
44232-docs-for-runner-ip-address.yml
44235-update-knapsack-to-1-16-0.yml
44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binary.yml
44280-fix-code-search.yml
44382-ui-breakdown-for-create-merge-request.yml Fix UI breakdown for Create merge request button 2018-03-23 00:32:16 +09:00
44383-cleanup-framework-header.yml
44384-cleanup-css-for-nested-lists.yml
44386-better-ux-for-long-name-branches.yml UX re-design branch items with flexbox 2018-03-22 22:11:00 +09:00
44388-update-rack-protection-to-2-0-1.yml
44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error.yml Fix 500 error when trying to resolve non-ASCII conflicts in editor 2018-03-23 18:33:14 +00:00
44587-autolinking-includes-trailing-exclamation-marks.yml Add ?, !, and : to trailing puncutation excluded from auto-linking 2018-03-23 15:51:28 +00:00
ab-44446-add-indexes-for-user-activity-queries.yml Add indexes for user activity queries. 2018-03-21 13:41:24 +01:00
adamco-gitlab-ce-move-issue-command.yml
add-query-counts-to-profiler-output.yml Add query counts by model to profiler output 2018-03-21 17:18:33 +00:00
ajax-requests-in-performance-bar.yml Show Ajax requests in performance bar 2018-03-19 19:06:09 +00:00
bvl-import-zip-multiple-assignees.yml
ci-pipeline-commit-lookup.yml Use porcelain commit lookup method on CI::CreatePipelineService 2018-03-22 11:39:20 -03:00
fix-42459---in-branch.yml
fix-auth0-unsafe-login.yml Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6' 2018-03-21 14:43:47 +00:00
fix-ci-job-auto-retry.yml Add CHANGELOG entry 2018-03-20 16:49:33 +01:00
fix-emoji-popup.yml
fix-mattermost-delete-team.yml
fj-15329-services-callbacks-ssrf.yml Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6' 2018-03-21 14:39:21 +00:00
ide-folder-button-path.yml Fixes the web IDE link in tree list opening the wrong URL 2018-03-21 12:06:44 +00:00
ide-project-avatar-identicon.yml Changes empty project avatar to identicon in the IDE 2018-03-21 11:27:43 +00:00
increase-unicorn-memory-killer-limits.yml Increase the memory limits used in the unicorn killer 2018-03-22 17:21:10 -07:00
issue_25542.yml Improve JIRA event descriptions 2018-03-19 16:36:16 -03:00
jej-commit-api-tracks-lfs.yml
jivl-realtime-update-adding-file.yml
jprovazn-issueref.yml Fix issuable state indicator 2018-03-23 10:04:44 +01:00
merge-request-widget-source-branch-improvements.yml
move-email-footer-info-to-single-line.yml Move email footer info to a single line 2018-03-21 12:29:20 -05:00
optional-api-delimiter.yml Optional '/-/' delimiter for search API 2018-03-19 20:02:15 +01:00
pages_force_https.yml Add HTTPS-only pages 2018-03-22 19:58:36 +01:00
refactor-move-assignee-title-vue-component.yml
refactor-move-mr-widget-memory-usage-and-graph-components.yml
refactor-move-mr-widget-nothing-to-merge-vue-component.yml
refactor-move-mr-widget-sha-mismatch-vue-component.yml
refactor-move-mr-widget-unresolved-discussions-vue-component.yml
refactor-move-time-tracking-vue-components.yml Move TimeTrackingCollapsedState vue component 2018-03-21 12:27:05 +02:00
sh-update-loofah.yml Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4 2018-03-22 13:51:02 -07:00
tc-re-add-read-only-banner.yml Add read-only banner to all pages 2018-03-22 20:34:45 +01:00
update-gitlab-ci-yml-services-docs.yml
update-spec-import-path-for-vue-mount-component-helper.yml Update spec import path for vue mount component helper 2018-03-20 18:58:29 +02:00
winh-deprecate-old-modal.yml Rename modal.vue to deprecated_modal.vue 2018-03-22 10:48:17 +01:00