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
..
backend	Refine Git garbage collection	2016-11-04 14:30:11 +01:00
badge	Fix pipeline fixtures and calls to removed method	2016-10-04 14:43:24 +02:00
bitbucket_import
checks
ci	Change name of method for setting CI config entries	2016-11-14 10:51:56 +01:00
conflict	Add blob_ace_mode to conflict content response	2016-10-13 14:16:35 -05:00
data_builder	refactors tests because of gitlab-test repository changes	2016-10-11 16:33:06 +01:00
database
diff	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
downtime_check
email	implements reset incoming email token on issues modal and account page,	2016-11-07 15:56:18 +00:00
fogbugz_import
gfm	Merge branch 'issue_23548_dev' into 'master'	2016-11-09 12:25:17 +01:00
git
github_import	Modify GitHub importer to be retryable	2016-10-28 11:30:20 +02:00
gitlab_import
google_code_import	Reuse LabelsFinder on Issueable#add_labels_by_names	2016-10-19 14:58:25 -02:00
graphs
import_export	Merge branch 'fix/import-export-symlink-vulnerability' into 'security'	2016-11-03 16:04:18 +01:00
ldap	Centralize LDAP config/filter logic	2016-11-11 15:58:33 -06:00
metrics
middleware
o_auth
saml
sanitizers
sherlock
slash_commands
sql
template
asciidoc_spec.rb
auth_spec.rb
award_emoji_spec.rb
blame_spec.rb
changes_list_spec.rb
closing_issue_extractor_spec.rb	Merge branch 'issue_23548_dev' into 'master'	2016-11-09 12:25:17 +01:00
color_schemes_spec.rb
contributions_calendar_spec.rb	Merge branch '23403-fix-events-for-private-project-features' into 'security'	2016-11-09 12:27:41 +01:00
current_settings_spec.rb
database_spec.rb
downtime_check_spec.rb
exclusive_lease_spec.rb	Refine Git garbage collection	2016-11-04 14:30:11 +01:00
git_access_spec.rb	Merge branch 'fix-unathorized-cloning' into 'security'	2016-11-09 12:27:17 +01:00
git_access_wiki_spec.rb	Merge branch 'fix-unathorized-cloning' into 'security'	2016-11-09 12:27:17 +01:00
git_spec.rb
highlight_spec.rb
identifier_spec.rb	Refactor Gitlab::Identifier	2016-10-05 12:40:17 +02:00
incoming_email_spec.rb
key_fingerprint_spec.rb
lazy_spec.rb
lfs_token_spec.rb
markup_helper_spec.rb
metrics_spec.rb
optimistic_locking_spec.rb	Make retry_lock to not be infinite	2016-10-27 12:34:35 +01:00
popen_spec.rb
project_search_results_spec.rb
redis_spec.rb	Updated mail_room and added sentinel support to Reply by Email	2016-10-26 05:02:47 +02:00
reference_extractor_spec.rb	Merge branch 'issue_23548_dev' into 'master'	2016-11-09 12:25:17 +01:00
regex_spec.rb
search_results_spec.rb
sidekiq_throttler_spec.rb	Refactored Sidekiq Throttler and updated documentation	2016-11-11 11:14:58 -06:00
snippet_search_results_spec.rb
themes_spec.rb
upgrader_spec.rb
uploads_transfer_spec.rb
url_builder_spec.rb
url_sanitizer_spec.rb
user_access_spec.rb
utils_spec.rb	Fix project features default values	2016-11-01 11:03:56 -02:00
version_info_spec.rb
workhorse_spec.rb