spec/controllers/projects · fdc7d7039b83c2d9b3578338408ce28c6423a483 · Forest Godfrey / gitlab-ce

Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' · fdc7d703

authored May 12, 2017

Fix conflict resolution from corrupted upstream

Closes gitlab-ee#2128

See merge request !11298

Conflicts:
	app/models/merge_request.rb
	spec/models/merge_request_spec.rb

fdc7d703

Name	Last commit	Last update
..
boards		Loading commit data...
registry		Loading commit data...
settings		Loading commit data...
artifacts_controller_spec.rb		Loading commit data...
avatars_controller_spec.rb		Loading commit data...
blame_controller_spec.rb		Loading commit data...
blob_controller_spec.rb		Loading commit data...
boards_controller_spec.rb		Loading commit data...
branches_controller_spec.rb		Loading commit data...
builds_controller_spec.rb		Loading commit data...
commit_controller_spec.rb		Loading commit data...
commits_controller_spec.rb		Loading commit data...
compare_controller_spec.rb		Loading commit data...
cycle_analytics_controller_spec.rb		Loading commit data...
deploy_keys_controller_spec.rb		Loading commit data...
deployments_controller_spec.rb		Loading commit data...
discussions_controller_spec.rb		Loading commit data...
environments_controller_spec.rb		Loading commit data...
find_file_controller_spec.rb		Loading commit data...
forks_controller_spec.rb		Loading commit data...
graphs_controller_spec.rb		Loading commit data...
group_links_controller_spec.rb		Loading commit data...
imports_controller_spec.rb		Loading commit data...
issues_controller_spec.rb		Loading commit data...
labels_controller_spec.rb		Loading commit data...
mattermosts_controller_spec.rb		Loading commit data...
merge_requests_controller_spec.rb		Loading commit data...
milestones_controller_spec.rb		Loading commit data...
notes_controller_spec.rb		Loading commit data...
pages_controller_spec.rb		Loading commit data...
pages_domains_controller_spec.rb		Loading commit data...
pipeline_schedules_controller_spec.rb		Loading commit data...
pipelines_controller_spec.rb		Loading commit data...
project_members_controller_spec.rb		Loading commit data...
protected_branches_controller_spec.rb		Loading commit data...
protected_tags_controller_spec.rb		Loading commit data...
raw_controller_spec.rb		Loading commit data...
refs_controller_spec.rb		Loading commit data...
releases_controller_spec.rb		Loading commit data...
repositories_controller_spec.rb		Loading commit data...
runners_controller_spec.rb		Loading commit data...
services_controller_spec.rb		Loading commit data...
snippets_controller_spec.rb		Loading commit data...
tags_controller_spec.rb		Loading commit data...
templates_controller_spec.rb		Loading commit data...
todos_controller_spec.rb		Loading commit data...
tree_controller_spec.rb		Loading commit data...
uploads_controller_spec.rb		Loading commit data...
variables_controller_spec.rb		Loading commit data...
wikis_controller_spec.rb		Loading commit data...