Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Forwardport] Removed double occurrence of keywords in sentences. #16973

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -1977,7 +1977,7 @@ Tests:
* [#686](https://github.com/magento/magento2/issues/686) -- Product save validation errors in the admin don't hide the overlay
* [#702](https://github.com/magento/magento2/issues/702) -- Base table or view not found
* [#652](https://github.com/magento/magento2/issues/652) -- Multishipping checkout not to change the Billing address js issue
* [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to to break the tabs functionality
* [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to break the tabs functionality
* Service Contracts:
* Refactored usage of new API of the Customer module
* Implemented Service Contracts for the Sales module
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ define([
this.options.cache.label = $(this.options.passwordStrengthMeterLabelSelector, this.element);

// We need to look outside the module for backward compatibility, since someone can already use the module.
// @todo Narrow this selector in 2.3 so it doesn't accidentally finds the the email field from the
// @todo Narrow this selector in 2.3 so it doesn't accidentally finds the email field from the
// newsletter email field or any other "email" field.
this.options.cache.email = $(this.options.formSelector).find(this.options.emailSelector);
this._bind();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ define([
if (IdentityLogin.win.closed ||
IdentityLogin.win.location.href == IdentityLogin.successCallbackUrl //eslint-disable-line eqeqeq
) {
//Stop the the polling
//Stop the polling
clearInterval(IdentityLogin.checker);
$('body').trigger('processStart');
//Check for window closed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* 1. localStorage - A new feature of HTML 5, localStorage can store megabytes of data per domain
* on the client computer. Data stored in the localStorage area has no expiration date, so we must
* manage expiring the data ourselves. localStorage is fully supported by IE8, and it is supposed
* to be working in Firefox 3 and Safari 3.2, but in reality is is flaky in those browsers. As
* to be working in Firefox 3 and Safari 3.2, but in reality is flaky in those browsers. As
* HTML 5 gets wider support, the AutoSave plugin will use it automatically. In Windows Vista/7,
* localStorage is stored in the following folder:
* C:\Users\[username]\AppData\Local\Microsoft\Internet Explorer\DOMStore\[tempFolder]
Expand Down Expand Up @@ -297,7 +297,7 @@
},

/**
* This method will store the current contents in the the storage engine.
* This method will store the current contents in the storage engine.
*
* @method storeDraft
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
sel.setRng(oldRng);
sel.setContent('');

// For some odd reason we need to detach the the mceInsertContent call from the paste event
// For some odd reason we need to detach the mceInsertContent call from the paste event
// It's like IE has a reference to the parent element that you paste in and the selection gets messed up
// when it tries to restore the selection
setTimeout(function() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public function testReindexWithProductNotVisibleIndividually()
$this->assertEquals(
7.5,
$this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $product->getId()),
"Catalog price rule doesn't apply to to product with visibility value \"Not Visibility Individually\""
"Catalog price rule doesn't apply to product with visibility value \"Not Visibility Individually\""
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ public function testGetCustomerAttributeMetadata()
$this->assertEquals(
$attributeMetadata,
$attributeMetadata1,
'Attribute metadata from the the same service became different after getAttributeCode was called'
'Attribute metadata from the same service became different after getAttributeCode was called'
);
// Verify the consistency of attribute metadata from two services
// after getAttributeCode was called
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2192,7 +2192,7 @@ protected function setupMultiRuleQuote()
}

/**
* Create the base results for the the multi rules test
* Create the base results for the multi rules test
*
* @return array
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/Magento/Framework/Api/Uploader.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public function __construct()
}

/**
* Explicitly set the the file attributes instead of setting it via constructor
* Explicitly set the file attributes instead of setting it via constructor
*
* @param array $fileAttributes
* @return void
Expand Down
2 changes: 1 addition & 1 deletion lib/web/MutationObserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@
if (lastRecord === newRecord)
return lastRecord;

// Check if the the record we are adding represents the same record. If
// Check if the record we are adding represents the same record. If
// so, we keep the one with the oldValue in it.
if (recordWithOldValue && recordRepresentsCurrentMutation(lastRecord))
return recordWithOldValue;
Expand Down
2 changes: 1 addition & 1 deletion lib/web/mage/requirejs/static.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ define('buildTools', [
isEnabled: storage.getItem(storeName) === null,

/**
* Removes base url from the the provided string
* Removes base url from the provided string
*
* @param {String} url - Url to be processed.
* @param {Object} config - RequiereJs config object.
Expand Down
2 changes: 1 addition & 1 deletion lib/web/modernizr/modernizr.js
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,7 @@ window.Modernizr = (function( window, document, undefined ) {
/** Name of the expando, to work with multiple documents or to re-shiv one document */
var expando = '_html5shiv';

/** The id for the the documents expando */
/** The id for the documents expando */
var expanID = 0;

/** Cached data for each document */
Expand Down
2 changes: 1 addition & 1 deletion setup/pub/angular/angular.js
Original file line number Diff line number Diff line change
Expand Up @@ -7770,7 +7770,7 @@
* caching.
* - **timeout** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise}
* that should abort the request when resolved.
* - **withCredentials** - `{boolean}` - whether to to set the `withCredentials` flag on the
* - **withCredentials** - `{boolean}` - whether to set the `withCredentials` flag on the
* XHR object. See [requests with credentials]https://developer.mozilla.org/en/http_access_control#section_5
* for more information.
* - **responseType** - `{string}` - see
Expand Down