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	Fix matcher `match_response_schema`	2016-08-17 12:58:59 -03:00
banzai	Fix Markdown styling inside reference links	2016-11-01 09:49:30 +00:00
cycle_analytics_helpers	Implement a second round of review comments from @DouweM.	2016-09-21 00:47:37 +05:30
features	Fix permission for setting an issue's due date	2016-09-28 17:41:32 +02:00
gitlab_stubs	Read job variables directly from gitlab CI config	2016-04-18 13:17:48 +02:00
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	Fix permission for setting an issue's due date	2016-09-28 17:41:32 +02:00
api_helpers.rb	Enable Style/MultilineTernaryOperator rubocop cop	2016-07-20 14:24:39 +02:00
capybara.rb	Fix Capybara 2.6.2 deprecation warnings	2016-03-15 11:03:17 -07:00
capybara_helpers.rb	Ensure only renderable text diffs are collapsed	2016-07-08 13:53:17 +01:00
carrierwave.rb	Move CarrierWave test env config to separate file	2016-03-30 13:57:01 +02:00
cycle_analytics_helpers.rb	Merge branch 'issue_23548_dev' into 'master'	2016-11-09 12:25:17 +01:00
db_cleaner.rb	Make sure DatabaseCleaner.clean runs AFTER Capybara's cleanup	2016-09-04 19:59:00 +03:00
email_format_shared_examples.rb	Validate email addresses using Devise.email_regexp	2016-02-09 18:15:35 +01:00
email_helpers.rb	Test against notification email	2016-10-21 18:22:09 +08:00
factory_girl.rb	Add spec/support/factory_girl	2015-06-30 17:47:53 -04:00
fake_u2f_device.rb	Add feature specs to cover naming and deleting U2F devices.	2016-08-18 22:12:02 +05:30
filter_spec_helper.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
fixture_helpers.rb	Add fixture_file helper.	2015-08-20 12:41:47 -07:00
git_helpers.rb	Generate branch/file names more randomly to avoid failures.	2016-09-07 11:26:07 +05:30
git_http_helpers.rb	Added git http requests tests for user with LDAP identity	2016-09-28 08:43:21 +02:00
import_spec_helper.rb	Move ImportSpecHelper to spec/support/	2016-06-08 17:21:08 +02:00
issue_helpers.rb	State specific default sort order for issuables	2016-08-01 11:28:56 +02:00
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	Request only the LDAP attributes we need	2016-09-09 13:14:57 -05:00
login_helpers.rb	Fix nesting on sessions/new.	2016-10-15 08:28:53 +02:00
markdown_feature.rb	Hook up the updated `WikiLinkFilter` to the wiki controllers.	2016-06-09 10:15:01 +05:30
mentionable_shared_examples.rb	Simplify Mentionable concern instance methods	2016-10-04 10:45:48 +02:00
merge_request_helpers.rb	State specific default sort order for issuables	2016-08-01 11:28:56 +02:00
notify_shared_examples.rb	Merge remote-tracking branch 'upstream/master' into pipeline-notifications	2016-10-25 23:03:47 +08:00
omni_auth.rb	Added a lot of stubbing to make sure OAUth requests are handled properly with 2FA	2016-07-07 16:54:03 -05:00
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	Added System Hooks for push and tag_push	2016-04-19 11:00:30 +02:00
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	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
reference_parser_shared_examples.rb	Merge branch 'issue_23548_dev' into 'master'	2016-11-09 12:25:17 +01:00
repo_helpers.rb	Add support to cherry-pick any commit	2016-04-18 15:39:07 +08:00
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	Hide passwords to non-admin users in the services API	2015-10-12 15:24:00 +02:00
setup_builds_storage.rb	Don't use "rm" for cleaning tmp/builds	2015-10-02 16:25:47 +02:00
slash_commands_helpers.rb	Move write_note into SlashCommandsHelper and update other dependent specs	2016-09-08 18:52:55 -04:00
snippets_shared_examples.rb	Fix snippets pagination	2016-09-26 12:42:12 +02:00
stub_configuration.rb	Rename reply_by_email to incoming_email to prepare for the future.	2015-09-21 10:35:37 +02:00
stub_gitlab_calls.rb	Rename all `[ci_]commit` to `[ci_]pipeline` in specs and features	2016-06-03 16:22:26 +02:00
stub_gitlab_data.rb	Merge CI factories and CI spec/support with GitLab	2015-09-09 13:37:50 +02:00
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	DRY up the added update service specs, add two email helpers	2016-08-16 17:08:43 +01:00
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	Fixed tests	2016-09-15 18:20:36 -04:00
webmock.rb	Add spec/support files for WebMock and test coverage	2015-06-10 01:31:27 -04:00
workhorse_helpers.rb	Verify JWT messages from gitlab-workhorse	2016-09-05 15:05:31 +02:00