diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-01-15 17:57:23 +0100 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-01-15 17:57:23 +0100 |
| commit | 522a4368b3f7a22fbdc91170466aadf55a310510 (patch) | |
| tree | 55c4473f71e15a5bb5fe06dfb1092bdf5d684b9e | |
| parent | 117de94f77bd8f55aa14a85d1560c86e8e759e04 (diff) | |
| download | gitlab-ce-522a4368b3f7a22fbdc91170466aadf55a310510.tar.gz | |
Fix Redirect for MR
| -rw-r--r-- | app/assets/javascripts/ide/stores/actions.js | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/repo.scss | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/ide/stores/actions.js b/app/assets/javascripts/ide/stores/actions.js index 8e3952b2791..5b1f6e7ddae 100644 --- a/app/assets/javascripts/ide/stores/actions.js +++ b/app/assets/javascripts/ide/stores/actions.js @@ -116,6 +116,8 @@ export const commitChanges = ( ); window.dispatchEvent(new Event('resize')); + dispatch('discardAllChanges'); + if (newMr) { dispatch( 'redirectToUrl', @@ -135,8 +137,6 @@ export const commitChanges = ( }); }); - dispatch('discardAllChanges'); - window.scrollTo(0, 0); } }) diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 87dceeac2df..9ed04b199d6 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -502,7 +502,8 @@ table.table tr td.multi-file-table-name { margin-bottom: 0; } - .alert-wrapper .flash-container .flash-alert:last-child, .alert-wrapper .flash-container .flash-notice:last-child { + .alert-wrapper .flash-container .flash-alert:last-child, + .alert-wrapper .flash-container .flash-notice:last-child { margin-bottom: 0; } |