diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-08 00:09:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-08 00:09:26 +0300 |
| commit | 17c8111494f51e79744c782db023804f5e4a7410 (patch) | |
| tree | 8aebe53b8aea72f9d4abac1bf9131203302a5b6e /app/assets/javascripts/behaviors | |
| parent | 4b7575da97d88ef4c7b2ec599b0c3fc457b4f561 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/behaviors')
| -rw-r--r-- | app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js index d5d8edd5ac0..c35a073b291 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js @@ -22,7 +22,7 @@ function eventHasModifierKeys(event) { export default class ShortcutsBlob extends Shortcuts { constructor(opts) { - const options = Object.assign({}, defaults, opts); + const options = { ...defaults, ...opts }; super(options.skipResetBindings); this.options = options; |