Add latest changes from gitlab-org/gitlab@master

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 }) => {

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(/^\//, '') || '/'),
         }),
       },
       {

locale/gitlab.pot

@@ -7080,6 +7080,9 @@ msgstr ""
 msgid "FeatureFlags|Get started with feature flags"
 msgstr ""
+msgid "FeatureFlags|ID"
+msgstr ""
+
 msgid "FeatureFlags|Inactive"
 msgstr ""

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' } },
       );
     }));