diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-11-20 17:52:50 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-11-20 17:52:50 +0000 |
commit | ac6673ddcfda0a0229b86f22543d31ddccc1dc55 (patch) | |
tree | db6982096f85f6d304127d3fc9cd7836978ccb46 /app | |
parent | d179ffc25ceb7ffd9bf241494c03a8d90a0aab58 (diff) | |
parent | b24316b2fe757324b037aea7e06ce52d8dfa53d8 (diff) | |
download | gitlab-ce-ac6673ddcfda0a0229b86f22543d31ddccc1dc55.tar.gz |
Merge branch 'ide-open-all-mr-files' into 'master'
Open first 10 merge request files in IDE
Closes #51635
See merge request gitlab-org/gitlab-ce!23234
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/ide/stores/actions/file.js | 9 | ||||
-rw-r--r-- | app/assets/javascripts/ide/stores/actions/merge_request.js | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js index 30dcf7ef4df..a297740bd5f 100644 --- a/app/assets/javascripts/ide/stores/actions/file.js +++ b/app/assets/javascripts/ide/stores/actions/file.js @@ -56,7 +56,10 @@ export const setFileActive = ({ commit, state, getters, dispatch }, path) => { dispatch('scrollToTab'); }; -export const getFileData = ({ state, commit, dispatch }, { path, makeFileActive = true }) => { +export const getFileData = ( + { state, commit, dispatch }, + { path, makeFileActive = true, openFile = makeFileActive }, +) => { const file = state.entries[path]; if (file.raw || (file.tempFile && !file.prevPath)) return Promise.resolve(); @@ -71,8 +74,8 @@ export const getFileData = ({ state, commit, dispatch }, { path, makeFileActive const normalizedHeaders = normalizeHeaders(headers); setPageTitle(decodeURI(normalizedHeaders['PAGE-TITLE'])); - commit(types.SET_FILE_DATA, { data, file }); - if (makeFileActive) commit(types.TOGGLE_FILE_OPEN, path); + if (data) commit(types.SET_FILE_DATA, { data, file }); + if (openFile) commit(types.TOGGLE_FILE_OPEN, path); if (makeFileActive) dispatch('setFileActive', path); commit(types.TOGGLE_LOADING, { entry: file }); }) diff --git a/app/assets/javascripts/ide/stores/actions/merge_request.js b/app/assets/javascripts/ide/stores/actions/merge_request.js index 3ac2f8b3698..8404c6d4f72 100644 --- a/app/assets/javascripts/ide/stores/actions/merge_request.js +++ b/app/assets/javascripts/ide/stores/actions/merge_request.js @@ -161,6 +161,7 @@ export const openMergeRequest = ( dispatch('getFileData', { path: change.new_path, makeFileActive: ind === 0, + openFile: true, }); } } |