Merge branch 'ce-to-ee-2018-02-14' into 'master'

CE upstream - 2018-02-14 09:25 UTC

See merge request gitlab-org/gitlab-ee!4526

app/helpers/diff_helper.rb

@@ -160,7 +160,7 @@ module DiffHelper
   end
 
   def diff_file_changed_icon(diff_file)
-    if diff_file.deleted_file? || diff_file.renamed_file?
+    if diff_file.deleted_file?
       "file-deletion"
     elsif diff_file.new_file?
       "file-addition"

changelogs/unreleased/42314-diff-file.yml

+---
+title: Render modified icon for moved file in changes dropdown
+merge_request:
+author:
+type: fixed

doc/install/database_mysql.md

@@ -6,7 +6,6 @@
 and [problems](https://bugs.mysql.com/bug.php?id=65830) that
 [suggested](https://bugs.mysql.com/bug.php?id=50909)
 [fixes](https://bugs.mysql.com/bug.php?id=65830) [have](https://bugs.mysql.com/bug.php?id=63164).
-- We recommend using MySQL version 5.6 or later. Please see the following [issue][ce-38152].
 
 ## Initial database setup