Stan Hu 0f61bb2dc5 Fix Error 500 when creating a merge request that contains an image that was deleted and added ... Steps to reproduce: 1. Start with a repo with an image 2. Add a commit to delete the image 3. Add another commit to replace the image with another image In a diff comparison, we really just compare about what the image was before the diff, not the direct parent of the last commit. This MR fixes that. Closes #3893, gitlab-org/gitlab-ee#678 Signed-off-by: Rémy Coutable <remy@rymai.me>		2016-11-14 15:57:01 +01:00
..
api	…
banzai	…
cycle_analytics_helpers	…
features	…
gitlab_stubs	…
import_export	…
matchers	…
services	…
api_helpers.rb	…
capybara.rb	…
capybara_helpers.rb	…
carrierwave.rb	…
cycle_analytics_helpers.rb	Merge branch 'issue_23548_dev' into 'master'	2016-11-09 12:25:17 +01:00
db_cleaner.rb	…
email_format_shared_examples.rb	…
email_helpers.rb	…
factory_girl.rb	…
fake_u2f_device.rb	…
filter_spec_helper.rb	…
fixture_helpers.rb	…
git_helpers.rb	…
git_http_helpers.rb	…
import_spec_helper.rb	…
issue_helpers.rb	…
issue_tracker_service_shared_example.rb	…
javascript_fixtures_helpers.rb	…
jira_service_helper.rb	…
ldap_helpers.rb	…
login_helpers.rb	…
markdown_feature.rb	…
mentionable_shared_examples.rb	…
merge_request_helpers.rb	…
notify_shared_examples.rb	…
omni_auth.rb	…
project_features_apply_to_issuables_shared_examples.rb	Merge branch '22481-honour-issue-visibility-for-groups' into 'security'	2016-11-09 12:24:13 +01:00
project_hook_data_shared_example.rb	…
rake_helpers.rb	…
reference_parser_helpers.rb	…
reference_parser_shared_examples.rb	Merge branch 'issue_23548_dev' into 'master'	2016-11-09 12:25:17 +01:00
repo_helpers.rb	…
search_helpers.rb	Fix broken commits search	2016-11-08 12:03:23 +02:00
select2_helper.rb	…
services_shared_context.rb	…
setup_builds_storage.rb	…
slash_commands_helpers.rb	…
snippets_shared_examples.rb	…
stub_configuration.rb	…
stub_gitlab_calls.rb	…
stub_gitlab_data.rb	…
taskable_shared_examples.rb	…
test_env.rb	Fix Error 500 when creating a merge request that contains an image that was deleted and added	2016-11-14 15:57:01 +01:00
updating_mentions_shared_examples.rb	…
wait_for_ajax.rb	…
wait_for_vue_resource.rb	…
webmock.rb	…
workhorse_helpers.rb	…