Douwe Maan fdd7e3f6e9 Merge branch 'stanhu/gitlab-ce-fix-error-500-with-mr-images' into 'master' ... Fix Error 500 when creating a merge request that contains an image that was deleted and added _Originally opened at !4816 by @stanhu._ - - - ## What does this MR do? This MR fixes an Error 500 when creating a merge request that contains an image that was deleted and added. Before, when displaying the before and after image, the code would always retrieve the image from the parent commit. However, in a diff, this could cause two different problems: The "before" image may not actually be the image you want to compare against (regression of #14327) It may appear as though a file was modified when it was really just added during the diff ## Are there points in the code the reviewer needs to double check? There may be a more elegant to fix this bug. ## What are the relevant issue numbers? Closes #3893, gitlab-org/gitlab-ee#678 See merge request !7457		2016-11-15 10:22:36 +00: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	Fix spec to set import_url before attempting to create import_data	2016-07-17 20:57:11 -07:00
checks	Change the order of the access rules to check simpler first, and add specs	2016-08-12 18:27:42 -04:00
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	fix	2016-09-15 21:59:59 -05:00
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	Better formatting for downtime check messages	2016-08-17 12:15:20 +02:00
email	implements reset incoming email token on issues modal and account page,	2016-11-07 15:56:18 +00:00
fogbugz_import	Enable Style/EmptyLines cop, remove redundant ones	2016-07-01 21:56:17 +02:00
gfm	Merge branch 'issue_23548_dev' into 'master'	2016-11-09 12:25:17 +01:00
git	Enable some Rubocop cops related to new lines	2016-08-03 12:02:41 +02:00
github_import	Modify GitHub importer to be retryable	2016-10-28 11:30:20 +02:00
gitlab_import	Fixed gitlab.com importer missing confidential attribute	2016-09-05 17:41:48 +02:00
google_code_import	Reuse LabelsFinder on Issueable#add_labels_by_names	2016-10-19 14:58:25 -02:00
graphs	Infinity Bug in Commit Statistics	2016-05-20 22:23:08 +02:00
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	Adds response mime type to transaction metric action when it's not HTML	2016-08-25 16:33:41 +02:00
middleware	Fix typo in gitlab-workhorse header	2016-08-19 12:25:52 +02:00
o_auth	Omniauth auto link LDAP user falls back to find by DN when user cannot be found by uid	2016-11-10 15:47:40 -06:00
saml	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
sanitizers	Improved SVG sanitizer specs to include smoke tests for clean.	2016-06-12 21:05:58 -04:00
sherlock	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
slash_commands	Fix behavior around commands with optional arguments	2016-08-18 14:29:49 -05:00
sql
template	Allow Member.add_user to handle access requesters	2016-09-28 09:43:00 +02:00
asciidoc_spec.rb	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
auth_spec.rb	Handle LFS token creation and retrieval in the same method, and in the same Redis connection.	2016-09-28 12:13:48 -05:00
award_emoji_spec.rb	Fix emoji paths in relative root configurations	2016-07-01 09:10:12 -07:00
blame_spec.rb
changes_list_spec.rb	api for generating new merge request	2016-08-11 23:37:00 +07:00
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	Handle case when Redis cache returns an empty setting	2016-06-29 14:28:41 -07:00
database_spec.rb	Improve Issuable.order_labels_priority	2016-06-06 11:59:49 -05:00
downtime_check_spec.rb	Added checks for migration downtime	2016-07-20 12:41:56 +02:00
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	Add spec covering 'committer_hash'	2016-09-20 10:15:43 -07:00
highlight_spec.rb	Fix specs	2016-08-01 13:24:06 +02:00
identifier_spec.rb	Refactor Gitlab::Identifier	2016-10-05 12:40:17 +02:00
incoming_email_spec.rb	It's for Message-ID so it should be message_id	2016-05-20 18:23:04 -05:00
key_fingerprint_spec.rb
lazy_spec.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
lfs_token_spec.rb	Handle LFS token creation and retrieval in the same method, and in the same Redis connection.	2016-09-28 12:13:48 -05:00
markup_helper_spec.rb
metrics_spec.rb	Tracking of custom events	2016-08-17 10:04:04 +02:00
optimistic_locking_spec.rb	Make retry_lock to not be infinite	2016-10-27 12:34:35 +01:00
popen_spec.rb	Use 'git update-ref' for safer web commits	2016-09-02 11:49:40 +02:00
project_search_results_spec.rb	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
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	Clean up search result classes	2016-09-06 10:12:55 +03:00
sidekiq_throttler_spec.rb	Refactored Sidekiq Throttler and updated documentation	2016-11-11 11:14:58 -06:00
snippet_search_results_spec.rb	Clean up search result classes	2016-09-06 10:12:55 +03:00
themes_spec.rb
upgrader_spec.rb	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
uploads_transfer_spec.rb
url_builder_spec.rb	Add DiffNote model	2016-07-06 18:50:59 -04:00
url_sanitizer_spec.rb	spec and fix for sanitize method	2016-07-11 09:01:09 +02:00
user_access_spec.rb	changes default_branch_protection to allow devs_can_merge protection option aswell	2016-08-04 21:15:26 +01:00
utils_spec.rb	Fix project features default values	2016-11-01 11:03:56 -02:00
version_info_spec.rb
workhorse_spec.rb	Use base SHA for patches and diffs	2016-09-22 18:49:31 +01:00