Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into MAGETWO-35818

Author: okarpenko

README.md

@@ -27,7 +27,7 @@ Use the following table to verify you have the correct prerequisites to install
 		</tr>
 	<tr>
 		<td>Apache 2.2 or 2.4</td>
-		<td>Ubuntu: <code>apache -v</code><br>
+		<td>Ubuntu: <code>apache2 -v</code><br>
 		CentOS: <code>httpd -v</code></td>
 		<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/apache.html">Apache</a></td>
 	</tr>
@@ -57,3 +57,17 @@ After verifying your prerequisites, perform the following tasks in order to prep
 	*	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html">Install Magento software using the web interface</a>
 	*	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/install-cli.html">Install Magento software using the command line</a>
 2.	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/verify.html">Verify the installation</a>
+
+<h2>Contributing to the Magento 2 code base</h2>
+Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
+
+To make learn about how to make a contribution, click [here][1].
+
+To learn about issues, click [here][2]. To open an issue, click [here][3].
+
+To suggest documentation improvements, click [here][4].
+
+[1]: <http://devdocs.magento.com/guides/v1.0/contributor-guide/CONTRIBUTING.html>
+[2]: <http://devdocs.magento.com/guides/v1.0/contributor-guide/CONTRIBUTING.html#report>
+[3]: <https://github.com/magento/magento2/issues>
+[4]: <http://devdocs.magento.com>

app/code/Magento/Quote/Model/Quote.php

@@ -1538,8 +1538,8 @@ public function addProduct(
         /**
          * Error message
          */
-        if (is_string($cartCandidates)) {
-            return $cartCandidates;
+        if (is_string($cartCandidates) || $cartCandidates instanceof \Magento\Framework\Phrase) {
+            return strval($cartCandidates);
         }
 
         /**

app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js

@@ -668,6 +668,7 @@ AdminOrder.prototype = {
         if (confirm(confirmMessage)) {
             this.collectElementsValue = false;
             order.sidebarApplyChanges({'sidebar[empty_customer_cart]': 1});
+            this.collectElementsValue = true;
         }
     },
 

dev/tests/integration/testsuite/Magento/Reports/Model/Resource/Report/Product/Viewed/CollectionTest.php

@@ -119,12 +119,6 @@ public function tableForPeriodDataProvider()
                 'date_from' => $dateYearAgo,
                 'date_to'   => null,
             ],
-            [
-                'period'    => 'month',
-                'table'     => 'report_viewed_product_aggregated_yearly',
-                'date_from' => null,
-                'date_to'   => $dateNow,
-            ],
             [
                 'period'    => 'year',
                 'table'     => 'report_viewed_product_aggregated_yearly',

lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/VersionTest.php

@@ -8,7 +8,6 @@
 
 use \Magento\Framework\App\View\Deployment\Version;
 
-
 class VersionTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -71,6 +70,7 @@ public function getValueFromStorageDataProvider()
 
     public function testGetValueDefaultModeSaving()
     {
+        $this->markTestSkipped('MAGETWO-35794');
         $this->appState
             ->expects($this->once())
             ->method('getMode')

lib/internal/Magento/Framework/Data/Form/Element/Textarea.php

@@ -15,6 +15,16 @@
 
 class Textarea extends AbstractElement
 {
+    /**
+     * Default number of rows
+     */
+    const DEFAULT_ROWS = 2;
+
+    /**
+     * Default number of columns
+     */
+    const DEFAULT_COLS = 15;
+
     /**
      * @param Factory $factoryElement
      * @param CollectionFactory $factoryCollection
@@ -30,8 +40,12 @@ public function __construct(
         parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
         $this->setType('textarea');
         $this->setExtType('textarea');
-        $this->setRows(2);
-        $this->setCols(15);
+        if (!$this->getRows()) {
+            $this->setRows(self::DEFAULT_ROWS);
+        }
+        if (!$this->getCols()) {
+            $this->setCols(self::DEFAULT_COLS);
+        }
     }
 
     /**
@@ -65,9 +79,8 @@ public function getHtmlAttributes()
     public function getElementHtml()
     {
         $this->addClass('textarea');
-        $html = '<textarea id="' . $this->getHtmlId() . '" name="' . $this->getName() . '" ' . $this->serialize(
-            $this->getHtmlAttributes()
-        ) . $this->_getUiId() . ' >';
+        $html = '<textarea id="' . $this->getHtmlId() . '" name="' . $this->getName() . '" '
+            . $this->serialize($this->getHtmlAttributes()) . $this->_getUiId() . ' >';
         $html .= $this->getEscapedValue();
         $html .= "</textarea>";
         $html .= $this->getAfterElementHtml();