Merge remote-tracking branch 'origin/MAGETWO-95922' into 2.1.16-develop-pr60

Author: viktorpetryk

.htaccess

@@ -114,15 +114,6 @@ DirectoryIndex index.php
         order allow,deny
         deny from all
     </Files>
-    <Files .user.ini>
-        <IfVersion < 2.4>
-            order allow,deny
-            deny from all
-        </IfVersion>
-        <IfVersion >= 2.4>
-            Require all denied
-        </IfVersion>
-    </Files>
 ErrorDocument 404 /pub/errors/404.php
 ErrorDocument 403 /pub/errors/404.php
 <IfModule mod_headers.c>

.htaccess.sample

@@ -278,15 +278,6 @@ DirectoryIndex index.php
         order allow,deny
         deny from all
     </Files>
-    <Files .user.ini>
-        <IfVersion < 2.4>
-            order allow,deny
-            deny from all
-        </IfVersion>
-        <IfVersion >= 2.4>
-            Require all denied
-        </IfVersion>
-    </Files>
 
 # For 404s and 403s that aren't handled by the application, show plain 404 response
 ErrorDocument 404 /pub/errors/404.php

app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

@@ -10,9 +10,6 @@
 
 namespace Magento\AdminNotification\Block\Grid\Renderer;
 
-/**
- * Renderer class for action in the admin notifications grid
- */
 class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
@@ -42,9 +39,9 @@ public function __construct(
      */
     public function render(\Magento\Framework\DataObject $row)
     {
-        $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' .
-            $this->escapeUrl($row->getUrl()) . '">' .
-            __('Read Details') . '</a> | ' : '';
+        $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' . __(
+            'Read Details'
+        ) . '</a> | ' : '';
 
         $markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
             '*/*/markAsRead/',

nginx.conf.sample

@@ -33,11 +33,6 @@ charset UTF-8;
 error_page 404 403 = /errors/404.php;
 #add_header "X-UA-Compatible" "IE=Edge";
 
-# Deny access to sensitive files
-location /.user.ini {
-    deny all;
-}
-
 # PHP entry point for setup application
 location ~* ^/setup($|/) {
     root $MAGE_ROOT;

pub/.htaccess

@@ -210,18 +210,6 @@ ErrorDocument 403 /errors/404.php
         deny from all
     </Files>
 
-###########################################
-## Deny access  to .user.ini
-    <Files .user.ini>
-        <IfVersion < 2.4>
-            order allow,deny
-            deny from all
-        </IfVersion>
-        <IfVersion >= 2.4>
-            Require all denied
-        </IfVersion>
-    </Files>
-
 <IfModule mod_headers.c>
     ############################################
     ## Prevent clickjacking