Robert Speicher 2b1ddb0f80 Merge branch 'mr-merge-base' into 'master' ... Correctly determine MR diff base when MR has merge conflicts Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779 See merge request !2632		2016-01-28 21:08:41 +00:00
..
ci	…
concerns	…
hooks	…
members	…
network	…
project_services	…
.gitkeep	…
ability.rb	…
abuse_report.rb	…
application_setting.rb	…
audit_event.rb	…
broadcast_message.rb	…
commit.rb	…
commit_range.rb	…
commit_status.rb	…
deploy_key.rb	…
deploy_keys_project.rb	…
diff_line.rb	…
email.rb	…
event.rb	…
external_issue.rb	…
forked_project_link.rb	…
generic_commit_status.rb	…
global_label.rb	…
global_milestone.rb	…
group.rb	…
identity.rb	…
issue.rb	…
jira_issue.rb	…
key.rb	…
label.rb	…
label_link.rb	…
lfs_object.rb	…
lfs_objects_project.rb	…
member.rb	…
merge_request.rb	Fix specs	2016-01-28 15:10:48 +01:00
merge_request_diff.rb	…
milestone.rb	…
namespace.rb	…
note.rb	…
notification.rb	…
personal_snippet.rb	…
project.rb	Fix specs	2016-01-28 15:10:48 +01:00
project_import_data.rb	…
project_snippet.rb	…
project_team.rb	…
project_wiki.rb	…
protected_branch.rb	…
release.rb	…
repository.rb	Fix specs	2016-01-28 15:10:48 +01:00
security_event.rb	…
sent_notification.rb	…
service.rb	…
snippet.rb	…
subscription.rb	…
tree.rb	…
user.rb	…
users_star_project.rb	…
wiki_page.rb	…