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	Fix Markdown styling inside reference links	2016-11-01 09:49:30 +00:00
cycle_analytics_helpers
features
gitlab_stubs
import_export	Merge branch 'fix/import-export-symlink-vulnerability' into 'security'	2016-11-03 16:04:18 +01:00
matchers	Add a be_like_time matcher and use it in specs	2016-10-17 14:44:20 +01:00
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	Test against notification email	2016-10-21 18:22:09 +08:00
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	Prevent wrong markdown on issue ids when project has Jira service activated	2016-10-19 13:46:04 -02:00
javascript_fixtures_helpers.rb	Replace static issue fixtures by script (!6059)	2016-10-28 14:02:17 +02:00
jira_service_helper.rb	Finish updates to use JIRA gem	2016-10-26 15:02:16 -02:00
ldap_helpers.rb
login_helpers.rb	Fix nesting on sessions/new.	2016-10-15 08:28:53 +02:00
markdown_feature.rb
mentionable_shared_examples.rb	Simplify Mentionable concern instance methods	2016-10-04 10:45:48 +02:00
merge_request_helpers.rb
notify_shared_examples.rb	Merge remote-tracking branch 'upstream/master' into pipeline-notifications	2016-10-25 23:03:47 +08:00
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	Add Rake task to create/repair GitLab Shell hooks symlinks	2016-11-01 14:52:59 -05:00
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	Trigger change even in select2 test helper to produce production-like behaviour	2016-10-24 13:14:00 +03:00
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	add "x of y tasks completed" on issuable	2016-10-28 14:01:36 -02:00
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 ajax for every merge request spinach test	2016-10-18 18:55:11 +03:00
wait_for_vue_resource.rb
webmock.rb
workhorse_helpers.rb