diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-20 19:30:05 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-20 19:30:05 +0000 |
commit | e1122c9f6daff16b900a0837d25789e1e5bdc56c (patch) | |
tree | 92e24cf5c600253a83df1a5bebd3d4a31df03b99 /app/assets/javascripts | |
parent | 3b54907f13c52e76fa0dd81d20b045b21a79afe4 (diff) | |
parent | 741233321d93ed3d33938e5856658c4b321d69fe (diff) | |
download | gitlab-ce-e1122c9f6daff16b900a0837d25789e1e5bdc56c.tar.gz |
Merge branch 'multi-file-editor-submodules' into 'master'
Added submodule support in multi-file editor
See merge request gitlab-org/gitlab-ce!14971
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/repo/components/repo_file.vue | 19 | ||||
-rw-r--r-- | app/assets/javascripts/repo/components/repo_sidebar.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/repo/helpers/repo_helper.js | 4 |
3 files changed, 25 insertions, 2 deletions
diff --git a/app/assets/javascripts/repo/components/repo_file.vue b/app/assets/javascripts/repo/components/repo_file.vue index c7e69340f17..8c86e87ed3a 100644 --- a/app/assets/javascripts/repo/components/repo_file.vue +++ b/app/assets/javascripts/repo/components/repo_file.vue @@ -28,6 +28,9 @@ marginLeft: `${this.file.level * 16}px`, }; }, + shortId() { + return this.file.id.substr(0, 8); + }, }, methods: { linkClicked(file) { @@ -55,6 +58,17 @@ > {{ file.name }} </a> + <template v-if="file.type === 'submodule' && file.id"> + @ + <span class="commit-sha"> + <a + @click.stop + :href="file.tree_url" + > + {{ shortId }} + </a> + </span> + </template> </td> <template v-if="!isMini"> @@ -69,7 +83,10 @@ </td> <td class="commit-update hidden-xs text-right"> - <span :title="tooltipTitle(file.lastCommit.updatedAt)"> + <span + v-if="file.lastCommit.updatedAt" + :title="tooltipTitle(file.lastCommit.updatedAt)" + > {{ timeFormated(file.lastCommit.updatedAt) }} </span> </td> diff --git a/app/assets/javascripts/repo/components/repo_sidebar.vue b/app/assets/javascripts/repo/components/repo_sidebar.vue index 5832e603907..09dc9ee25d7 100644 --- a/app/assets/javascripts/repo/components/repo_sidebar.vue +++ b/app/assets/javascripts/repo/components/repo_sidebar.vue @@ -74,6 +74,10 @@ export default { if (file.type === 'tree' && file.opened) { Helper.setDirectoryToClosed(file); Store.setActiveLine(lineNumber); + } else if (file.type === 'submodule') { + file.loading = true; + + gl.utils.visitUrl(file.url); } else { const openFile = Helper.getFileFromPath(file.url); diff --git a/app/assets/javascripts/repo/helpers/repo_helper.js b/app/assets/javascripts/repo/helpers/repo_helper.js index 19425cedc90..f7b7f93e4b8 100644 --- a/app/assets/javascripts/repo/helpers/repo_helper.js +++ b/app/assets/javascripts/repo/helpers/repo_helper.js @@ -157,12 +157,14 @@ const RepoHelper = { }, serializeRepoEntity(type, entity, level = 0) { - const { url, name, icon, last_commit } = entity; + const { id, url, name, icon, last_commit, tree_url } = entity; return { + id, type, name, url, + tree_url, level, icon: `fa-${icon}`, files: [], |