Skip to content

Commit 5f7064f

Browse files
author
Oleksii Korshenko
authored
Merge pull request #935 from magento-engcom/develop-prs
Public Pull Requests: #8910 #8907 #7541 #8808
2 parents f7a552f + 11faddf commit 5f7064f

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ atlassian*
2525
/.grunt
2626
/Gruntfile.js
2727
/package.json
28+
/grunt-config.json
29+
/dev/tools/grunt/configs/local-themes.js
2830

2931
/pub/media/*.*
3032
!/pub/media/.htaccess

app/code/Magento/Backend/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ Minute,Minute
250250
"JavaScript may be disabled in your browser.","JavaScript may be disabled in your browser."
251251
"To use this website you must first enable JavaScript in your browser.","To use this website you must first enable JavaScript in your browser."
252252
"This is only a demo store. You can browse and place orders, but nothing will be processed.","This is only a demo store. You can browse and place orders, but nothing will be processed."
253-
"Report a Bug","Report a Bug"
253+
"Report an Issue","Report an Issue"
254254
"Store View:","Store View:"
255255
"Stores Configuration","Stores Configuration"
256256
"Please confirm scope switching. All data that hasn\'t been saved will be lost.","Please confirm scope switching. All data that hasn\'t been saved will be lost."

app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88

99
?>
1010
<?php if ($block->getBugreportUrl()): ?>
11-
<a class="link-report" href="<?php /* @escapeNotVerified */ echo $block->getBugreportUrl(); ?>" id="footer_bug_tracking"><?php /* @escapeNotVerified */ echo __('Report a Bug') ?></a>
11+
<a class="link-report" href="<?php /* @escapeNotVerified */ echo $block->getBugreportUrl(); ?>" id="footer_bug_tracking"><?php /* @escapeNotVerified */ echo __('Report an Issue') ?></a>
1212
<?php endif; ?>

app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ interface GuestCartItemRepositoryInterface
2121
public function getList($cartId);
2222

2323
/**
24-
* Add the specified item to the specified cart.
24+
* Add/update the specified cart item.
2525
*
2626
* @param \Magento\Quote\Api\Data\CartItemInterface $cartItem The item.
2727
* @return \Magento\Quote\Api\Data\CartItemInterface Item.

app/code/Magento/Sales/Model/OrderRepository.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
namespace Magento\Sales\Model;
77

88
use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
9-
use Magento\Sales\Model\ResourceModel\Order as Resource;
109
use Magento\Sales\Model\ResourceModel\Metadata;
1110
use Magento\Sales\Model\Order\ShippingAssignmentBuilder;
1211
use Magento\Sales\Api\Data\OrderSearchResultInterfaceFactory as SearchResultFactory;
@@ -16,7 +15,6 @@
1615
use Magento\Sales\Api\Data\ShippingAssignmentInterface;
1716
use Magento\Framework\Exception\NoSuchEntityException;
1817
use Magento\Framework\Exception\InputException;
19-
use Magento\Framework\Api\SortOrder;
2018

2119
/**
2220
* Repository class for @see OrderInterface

0 commit comments

Comments
 (0)