diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-11 15:08:44 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-11 15:08:44 +0000 |
| commit | bcc77054ee9aefd1e332e04a4189390fd5a3112e (patch) | |
| tree | e6e1908c310e4733038794e932196cae0d66ba9a /app/assets | |
| parent | 05b5c609cb8c260b10c2eb1b92b711dc82d32c3f (diff) | |
| download | gitlab-ce-bcc77054ee9aefd1e332e04a4189390fd5a3112e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/blob/file_template_mediator.js | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/code_navigation/store/actions.js | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/app/assets/javascripts/blob/file_template_mediator.js b/app/assets/javascripts/blob/file_template_mediator.js index 2df7a84ead0..0fb02ca5965 100644 --- a/app/assets/javascripts/blob/file_template_mediator.js +++ b/app/assets/javascripts/blob/file_template_mediator.js @@ -117,11 +117,7 @@ export default class FileTemplateMediator { selector.hide(); } }); - - if (this.editor.getValue() !== '') { - this.setTypeSelectorToggleText(item.name); - } - + this.setTypeSelectorToggleText(item.name); this.cacheToggleText(); } diff --git a/app/assets/javascripts/code_navigation/store/actions.js b/app/assets/javascripts/code_navigation/store/actions.js index 10483abfb23..cb6d30c775d 100644 --- a/app/assets/javascripts/code_navigation/store/actions.js +++ b/app/assets/javascripts/code_navigation/store/actions.js @@ -16,7 +16,7 @@ export default { commit(types.REQUEST_DATA); api - .lsifData(state.projectPath, state.commitId, state.path) + .lsifData(state.projectPath, state.commitId, state.blobPath) .then(({ data }) => { const normalizedData = data.reduce((acc, d) => { if (d.hover) { |