diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-12-05 12:11:31 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-12-05 12:11:31 +0300 |
| commit | 2cd710732e6b2b6d31b4fd01a6d065c33db066b3 (patch) | |
| tree | 5845c14f72e8428110416cdee0ef982ce83bb875 /app/assets/javascripts | |
| parent | 00acef434031b5dc0bf39576a9e83802c7806842 (diff) | |
| parent | 9afc3069b00d0f9beee3e838e134d7939823aa1f (diff) | |
Merge branch 'expand-diff-bug' into 'master'
Fixed diff files not expanding
Closes #54868
See merge request gitlab-org/gitlab-ce!23555
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/diffs/store/actions.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js index 8b477c678fd..c87e178c8cf 100644 --- a/app/assets/javascripts/diffs/store/actions.js +++ b/app/assets/javascripts/diffs/store/actions.js @@ -148,7 +148,7 @@ export const scrollToLineIfNeededParallel = (_, line) => { }; export const loadCollapsedDiff = ({ commit }, file) => - axios.get(file.loadCollapsedDiffUrl).then(res => { + axios.get(file.load_collapsed_diff_url).then(res => { commit(types.ADD_COLLAPSED_DIFFS, { file, data: res.data, |