diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-02 00:06:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-02 00:06:19 +0000 |
| commit | 2af6d2c4378762ee07a70c3a8086f10e716bb011 (patch) | |
| tree | 3c02c775c98ba16dc87f845755dfd4c94cd902b2 | |
| parent | 9c4066878fe309781bbadd20f87c223c12dc60f6 (diff) | |
| download | gitlab-ce-2af6d2c4378762ee07a70c3a8086f10e716bb011.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | app/assets/javascripts/repository/log_tree.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/repository/router.js | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 | ||||
| -rw-r--r-- | spec/frontend/repository/log_tree_spec.js | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/javascripts/repository/log_tree.js b/app/assets/javascripts/repository/log_tree.js index 2c19aca2397..d4eec35a8e5 100644 --- a/app/assets/javascripts/repository/log_tree.js +++ b/app/assets/javascripts/repository/log_tree.js @@ -37,7 +37,7 @@ export function fetchLogsTree(client, path, offset, resolver = null) { const { ref } = client.readQuery({ query: getRef }); fetchpromise = axios - .get(`${gon.gitlab_url}/${projectPath}/refs/${ref}/logs_tree${path ? `/${path}` : ''}`, { + .get(`${gon.gitlab_url}/${projectPath}/refs/${ref}/logs_tree/${path.replace(/^\//, '')}`, { params: { format: 'json', offset }, }) .then(({ data, headers }) => { diff --git a/app/assets/javascripts/repository/router.js b/app/assets/javascripts/repository/router.js index 9322c81ab97..ebf0a7091ea 100644 --- a/app/assets/javascripts/repository/router.js +++ b/app/assets/javascripts/repository/router.js @@ -16,7 +16,7 @@ export default function createRouter(base, baseRef) { name: 'treePath', component: TreePage, props: route => ({ - path: route.params.pathMatch && route.params.pathMatch.replace(/^\//, ''), + path: route.params.pathMatch && (route.params.pathMatch.replace(/^\//, '') || '/'), }), }, { diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 02e7a8259a6..840ec9c88dc 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -7080,6 +7080,9 @@ msgstr "" msgid "FeatureFlags|Get started with feature flags" msgstr "" +msgid "FeatureFlags|ID" +msgstr "" + msgid "FeatureFlags|Inactive" msgstr "" diff --git a/spec/frontend/repository/log_tree_spec.js b/spec/frontend/repository/log_tree_spec.js index a3a766eca41..9eee89cd07b 100644 --- a/spec/frontend/repository/log_tree_spec.js +++ b/spec/frontend/repository/log_tree_spec.js @@ -81,7 +81,7 @@ describe('fetchLogsTree', () => { it('calls axios get', () => fetchLogsTree(client, '', '0', resolver).then(() => { expect(axios.get).toHaveBeenCalledWith( - 'https://test.com/gitlab-org/gitlab-foss/refs/master/logs_tree', + 'https://test.com/gitlab-org/gitlab-foss/refs/master/logs_tree/', { params: { format: 'json', offset: '0' } }, ); })); |