Merge branch 'multi-file-editor-submodules' into 'master'

Added submodule support in multi-file editor

See merge request gitlab-org/gitlab-ce!14971

4 files changed, 26 insertions, 3 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: [],
diff --git a/app/serializers/submodule_entity.rb b/app/serializers/submodule_entity.rb
index 9a7eb5e7880..ed1f1ae0ef0 100644
--- a/app/serializers/submodule_entity.rb
+++ b/app/serializers/submodule_entity.rb
@@ -7,7 +7,7 @@ class SubmoduleEntity < Grape::Entity
     'archive'
   end
 
-  expose :project_url do |blob|
+  expose :url do |blob|
     submodule_links(blob, request).first
   end