diff options
author | Phil Hughes <me@iamphill.com> | 2018-06-15 22:07:51 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-06-15 22:07:51 +0300 |
commit | 6e06171ee6a7d002e279f8783a4958bedb2b3389 (patch) | |
tree | 7bf55564a4cfaee55435c3d35c02a6ca0ca50454 /app/assets/javascripts/ide/lib | |
parent | e3e4a7f3afb843a8962100bbbb5eeccb0b43d096 (diff) | |
parent | 5104098fab7f72fff15d5e1a69f1597391b59b31 (diff) |
Merge branch 'fix-web-ide-disable-markdown-autocomplete' into 'master'
Resolve "Web IDE autocomplete should be disabled in markdown files"
Closes #47796
See merge request gitlab-org/gitlab-ce!19760
Diffstat (limited to 'app/assets/javascripts/ide/lib')
-rw-r--r-- | app/assets/javascripts/ide/lib/editor_options.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/lib/editor_options.js b/app/assets/javascripts/ide/lib/editor_options.js index 9f895d49f2e..e35595ab1fd 100644 --- a/app/assets/javascripts/ide/lib/editor_options.js +++ b/app/assets/javascripts/ide/lib/editor_options.js @@ -12,5 +12,6 @@ export const defaultEditorOptions = { export default [ { readOnly: model => !!model.file.file_lock, + quickSuggestions: model => !(model.language === 'markdown'), }, ]; |