lib/gitlab/git · 39cb31f16a79056efd280162b79b8da37b469b55 · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

History Find file

Merge branch… · ef28cab3

authored Mar 23, 2018

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

ef28cab3

Name	Last commit	Last update
..
conflict		Loading commit data...
storage		Loading commit data...
attributes_at_ref_parser.rb		Loading commit data...
attributes_parser.rb		Loading commit data...
blame.rb		Loading commit data...
blob.rb		Loading commit data...
blob_snippet.rb		Loading commit data...
branch.rb		Loading commit data...
commit.rb		Loading commit data...
commit_stats.rb		Loading commit data...
compare.rb		Loading commit data...
diff.rb		Loading commit data...
diff_collection.rb		Loading commit data...
env.rb		Loading commit data...
gitlab_projects.rb		Loading commit data...
gitmodules_parser.rb		Loading commit data...
hook.rb		Loading commit data...
hooks_service.rb		Loading commit data...
index.rb		Loading commit data...
info_attributes.rb		Loading commit data...
lfs_changes.rb		Loading commit data...
lfs_pointer_file.rb		Loading commit data...
operation_service.rb		Loading commit data...
path_helper.rb		Loading commit data...
popen.rb		Loading commit data...
ref.rb		Loading commit data...
remote_mirror.rb		Loading commit data...
remote_repository.rb		Loading commit data...
repository.rb		Loading commit data...
repository_mirroring.rb		Loading commit data...
rev_list.rb		Loading commit data...
storage.rb		Loading commit data...
tag.rb		Loading commit data...
tree.rb		Loading commit data...
user.rb		Loading commit data...
util.rb		Loading commit data...
wiki.rb		Loading commit data...
wiki_file.rb		Loading commit data...
wiki_page.rb		Loading commit data...
wiki_page_version.rb		Loading commit data...