diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-06-05 18:44:53 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-06-05 18:44:53 +0300 |
| commit | 327c7d5a07fa08276a52b6a2bfdf79eee812a2cd (patch) | |
| tree | 0da14d9a65451f5c1937fb8679cab3ab9f4c7954 /app/assets/javascripts | |
| parent | 86ff32da666c8d284ecff5987d42fa4dfed2ee9b (diff) | |
| parent | 4644a2daf5ec5e86e2b2989f04e99e4f081f6fef (diff) | |
Merge branch 'graphql-file-entry-url' into 'master'
Add web_url to tree entry in GraphQL API
See merge request gitlab-org/gitlab-ce!28646
Diffstat (limited to 'app/assets/javascripts')
3 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/repository/components/table/index.vue b/app/assets/javascripts/repository/components/table/index.vue index cccde1bb278..d2198bcccfe 100644 --- a/app/assets/javascripts/repository/components/table/index.vue +++ b/app/assets/javascripts/repository/components/table/index.vue @@ -134,6 +134,7 @@ export default { :current-path="path" :path="entry.flatPath" :type="entry.type" + :url="entry.webUrl" /> </template> </tbody> diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue index 9a264bef87e..764882a7936 100644 --- a/app/assets/javascripts/repository/components/table/row.vue +++ b/app/assets/javascripts/repository/components/table/row.vue @@ -21,6 +21,11 @@ export default { type: String, required: true, }, + url: { + type: String, + required: false, + default: null, + }, }, computed: { routerLinkTo() { @@ -59,7 +64,7 @@ export default { <tr v-once :class="`file_${id}`" class="tree-item" @click="openRow"> <td class="tree-item-file-name"> <i :aria-label="type" role="img" :class="iconName" class="fa fa-fw"></i> - <component :is="linkComponent" :to="routerLinkTo" class="str-truncated"> + <component :is="linkComponent" :to="routerLinkTo" :href="url" class="str-truncated"> {{ fullPath }} </component> <template v-if="isSubmodule"> diff --git a/app/assets/javascripts/repository/queries/getFiles.graphql b/app/assets/javascripts/repository/queries/getFiles.graphql index a9b61d28560..7d92bc46455 100644 --- a/app/assets/javascripts/repository/queries/getFiles.graphql +++ b/app/assets/javascripts/repository/queries/getFiles.graphql @@ -23,6 +23,7 @@ query getFiles( edges { node { ...TreeEntry + webUrl } } pageInfo { @@ -43,6 +44,7 @@ query getFiles( edges { node { ...TreeEntry + webUrl } } pageInfo { |