Merge "Merge branch 'stable-2.16' into stable-3.0" into stable-3.0

plugins/delete-project

diff --git a/plugins/delete-project b/plugins/delete-project
index f8aa8cf..171704d 160000
--- a/plugins/delete-project
+++ b/plugins/delete-project
@@ -1 +1 @@
-Subproject commit f8aa8cf47a7844c4835bea477b34aae320a35373
+Subproject commit 171704d1cdcd3ec281fbe90f7b5a9302b4b66866

polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js

diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
index d73042e..5d91817 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
@@ -538,8 +538,7 @@
 
     _goToEditFile() {
       // TODO(taoalpha): add a shortcut for editing
-      const editUrl = Gerrit.Nav.getEditUrlForDiff(
-          this._change, this._path, this._patchRange.patchNum);
+      const editUrl = Gerrit.Nav.getEditUrlForDiff(this._change, this._path);
       return Gerrit.Nav.navigateToRelativeUrl(editUrl);
     },
 

polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html

diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html
index b33c54c..e374bab 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html
@@ -378,6 +378,7 @@
       };
       element._change = {
         _number: 42,
+        project: 'gerrit',
         status: 'NEW',
         revisions: {
           a: {_number: 1, commit: {parents: []}},
@@ -391,6 +392,8 @@
         assert.isTrue(!!editBtn);
         MockInteractions.tap(editBtn);
         assert.isTrue(redirectStub.called);
+        assert.isTrue(redirectStub.lastCall.calledWithExactly(
+            Gerrit.Nav.getEditUrlForDiff(element._change, element._path)));
         done();
       });
     });