Add latest changes from gitlab-org/gitlab@master

19 files changed, 54 insertions, 54 deletions

diff --git a/app/assets/javascripts/repository/components/breadcrumbs.vue b/app/assets/javascripts/repository/components/breadcrumbs.vue
index 8a11c3dcafe..45c343c3f7f 100644
--- a/app/assets/javascripts/repository/components/breadcrumbs.vue
+++ b/app/assets/javascripts/repository/components/breadcrumbs.vue
@@ -4,9 +4,9 @@ import { joinPaths, escapeFileUrl } from '~/lib/utils/url_utility';
 import { __ } from '../../locale';
 import Icon from '../../vue_shared/components/icon.vue';
 import getRefMixin from '../mixins/get_ref';
-import projectShortPathQuery from '../queries/project_short_path.query.graphql';
-import projetPathQuery from '../queries/project_path.query.graphql';
-import permissionsQuery from '../queries/permissions.query.graphql';
+import getProjectShortPath from '../queries/getProjectShortPath.query.graphql';
+import getProjectPath from '../queries/getProjectPath.query.graphql';
+import getPermissions from '../queries/getPermissions.query.graphql';
 
 const ROW_TYPES = {
   header: 'header',
@@ -23,13 +23,13 @@ export default {
   },
   apollo: {
     projectShortPath: {
-      query: projectShortPathQuery,
+      query: getProjectShortPath,
     },
     projectPath: {
-      query: projetPathQuery,
+      query: getProjectPath,
     },
     userPermissions: {
-      query: permissionsQuery,
+      query: getPermissions,
       variables() {
         return {
           projectPath: this.projectPath,
diff --git a/app/assets/javascripts/repository/components/last_commit.vue b/app/assets/javascripts/repository/components/last_commit.vue
index 0206a61487c..c5c99d56e2a 100644
--- a/app/assets/javascripts/repository/components/last_commit.vue
+++ b/app/assets/javascripts/repository/components/last_commit.vue
@@ -8,8 +8,8 @@ import TimeagoTooltip from '../../vue_shared/components/time_ago_tooltip.vue';
 import CiIcon from '../../vue_shared/components/ci_icon.vue';
 import ClipboardButton from '../../vue_shared/components/clipboard_button.vue';
 import getRefMixin from '../mixins/get_ref';
-import projectPathQuery from '../queries/project_path.query.graphql';
-import pathLastCommitQuery from '../queries/path_last_commit.query.graphql';
+import getProjectPath from '../queries/getProjectPath.query.graphql';
+import pathLastCommit from '../queries/pathLastCommit.query.graphql';
 
 export default {
   components: {
@@ -28,10 +28,10 @@ export default {
   mixins: [getRefMixin],
   apollo: {
     projectPath: {
-      query: projectPathQuery,
+      query: getProjectPath,
     },
     commit: {
-      query: pathLastCommitQuery,
+      query: pathLastCommit,
       variables() {
         return {
           projectPath: this.projectPath,
@@ -102,7 +102,7 @@ export default {
     <template v-else-if="commit">
       <user-avatar-link
         v-if="commit.author"
-        :link-href="commit.author.webPath"
+        :link-href="commit.author.webUrl"
         :img-src="commit.author.avatarUrl"
         :img-size="40"
         class="avatar-cell"
@@ -118,7 +118,7 @@ export default {
       <div class="commit-detail flex-list">
         <div class="commit-content qa-commit-content">
           <gl-link
-            :href="commit.webPath"
+            :href="commit.webUrl"
             :class="{ 'font-italic': !commit.message }"
             class="commit-row-message item-title"
             v-html="commit.titleHtml"
@@ -135,7 +135,7 @@ export default {
           <div class="committer">
             <gl-link
               v-if="commit.author"
-              :href="commit.author.webPath"
+              :href="commit.author.webUrl"
               class="commit-author-link js-user-link"
             >
               {{ commit.author.name }}
diff --git a/app/assets/javascripts/repository/components/preview/index.vue b/app/assets/javascripts/repository/components/preview/index.vue
index ecf98ebe7db..f96523bb497 100644
--- a/app/assets/javascripts/repository/components/preview/index.vue
+++ b/app/assets/javascripts/repository/components/preview/index.vue
@@ -3,15 +3,15 @@ import $ from 'jquery';
 import '~/behaviors/markdown/render_gfm';
 import { GlLink, GlLoadingIcon } from '@gitlab/ui';
 import { handleLocationHash } from '~/lib/utils/common_utils';
-import readmeQery from '../../queries/readme.query.graphql';
+import getReadmeQuery from '../../queries/getReadme.query.graphql';
 
 export default {
   apollo: {
     readme: {
-      query: readmeQery,
+      query: getReadmeQuery,
       variables() {
         return {
-          url: this.blob.webPath,
+          url: this.blob.webUrl,
         };
       },
       loadingKey: 'loading',
@@ -51,7 +51,7 @@ export default {
     <div class="js-file-title file-title-flex-parent">
       <div class="file-header-content">
         <i aria-hidden="true" class="fa fa-file-text-o fa-fw"></i>
-        <gl-link :href="blob.webPath">
+        <gl-link :href="blob.webUrl">
           <strong>{{ blob.name }}</strong>
         </gl-link>
       </div>
diff --git a/app/assets/javascripts/repository/components/table/index.vue b/app/assets/javascripts/repository/components/table/index.vue
index 4077e3f8cdc..c1f350dccd6 100644
--- a/app/assets/javascripts/repository/components/table/index.vue
+++ b/app/assets/javascripts/repository/components/table/index.vue
@@ -2,7 +2,7 @@
 import { GlSkeletonLoading } from '@gitlab/ui';
 import { sprintf, __ } from '../../../locale';
 import getRefMixin from '../../mixins/get_ref';
-import projectPathQuery from '../../queries/project_path.query.graphql';
+import getProjectPath from '../../queries/getProjectPath.query.graphql';
 import TableHeader from './header.vue';
 import TableRow from './row.vue';
 import ParentRow from './parent_row.vue';
@@ -17,7 +17,7 @@ export default {
   mixins: [getRefMixin],
   apollo: {
     projectPath: {
-      query: projectPathQuery,
+      query: getProjectPath,
     },
   },
   props: {
@@ -96,7 +96,7 @@ export default {
               :name="entry.name"
               :path="entry.flatPath"
               :type="entry.type"
-              :url="entry.webUrl || entry.webPath"
+              :url="entry.webUrl"
               :submodule-tree-url="entry.treeUrl"
               :lfs-oid="entry.lfsOid"
               :loading-path="loadingPath"
diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue
index 95e34280665..d5363016335 100644
--- a/app/assets/javascripts/repository/components/table/row.vue
+++ b/app/assets/javascripts/repository/components/table/row.vue
@@ -12,7 +12,7 @@ import { escapeFileUrl } from '~/lib/utils/url_utility';
 import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import FileIcon from '~/vue_shared/components/file_icon.vue';
 import getRefMixin from '../../mixins/get_ref';
-import commitQuery from '../../queries/commit.query.graphql';
+import getCommit from '../../queries/getCommit.query.graphql';
 
 export default {
   components: {
@@ -29,7 +29,7 @@ export default {
   },
   apollo: {
     commit: {
-      query: commitQuery,
+      query: getCommit,
       variables() {
         return {
           fileName: this.name,
diff --git a/app/assets/javascripts/repository/components/tree_content.vue b/app/assets/javascripts/repository/components/tree_content.vue
index 721cc6787dc..59ba1caa8c9 100644
--- a/app/assets/javascripts/repository/components/tree_content.vue
+++ b/app/assets/javascripts/repository/components/tree_content.vue
@@ -3,8 +3,8 @@ import createFlash from '~/flash';
 import { __ } from '../../locale';
 import FileTable from './table/index.vue';
 import getRefMixin from '../mixins/get_ref';
-import filesQuery from '../queries/files.query.graphql';
-import projectPathQuery from '../queries/project_path.query.graphql';
+import getFiles from '../queries/getFiles.query.graphql';
+import getProjectPath from '../queries/getProjectPath.query.graphql';
 import FilePreview from './preview/index.vue';
 import { readmeFile } from '../utils/readme';
 
@@ -18,7 +18,7 @@ export default {
   mixins: [getRefMixin],
   apollo: {
     projectPath: {
-      query: projectPathQuery,
+      query: getProjectPath,
     },
   },
   props: {
@@ -70,7 +70,7 @@ export default {
 
       return this.$apollo
         .query({
-          query: filesQuery,
+          query: getFiles,
           variables: {
             projectPath: this.projectPath,
             ref: this.ref,
diff --git a/app/assets/javascripts/repository/log_tree.js b/app/assets/javascripts/repository/log_tree.js
index 704dd88aabe..cef17bf7acb 100644
--- a/app/assets/javascripts/repository/log_tree.js
+++ b/app/assets/javascripts/repository/log_tree.js
@@ -1,8 +1,8 @@
 import { normalizeData } from 'ee_else_ce/repository/utils/commit';
 import axios from '~/lib/utils/axios_utils';
-import commitsQuery from './queries/commits.query.graphql';
-import projectPathQuery from './queries/project_path.query.graphql';
-import refQuery from './queries/ref.query.graphql';
+import getCommits from './queries/getCommits.query.graphql';
+import getProjectPath from './queries/getProjectPath.query.graphql';
+import getRef from './queries/getRef.query.graphql';
 
 let fetchpromise;
 let resolvers = [];
@@ -22,8 +22,8 @@ export function fetchLogsTree(client, path, offset, resolver = null) {
 
   if (fetchpromise) return fetchpromise;
 
-  const { projectPath } = client.readQuery({ query: projectPathQuery });
-  const { escapedRef } = client.readQuery({ query: refQuery });
+  const { projectPath } = client.readQuery({ query: getProjectPath });
+  const { escapedRef } = client.readQuery({ query: getRef });
 
   fetchpromise = axios
     .get(
@@ -36,10 +36,10 @@ export function fetchLogsTree(client, path, offset, resolver = null) {
     )
     .then(({ data, headers }) => {
       const headerLogsOffset = headers['more-logs-offset'];
-      const { commits } = client.readQuery({ query: commitsQuery });
+      const { commits } = client.readQuery({ query: getCommits });
       const newCommitData = [...commits, ...normalizeData(data, path)];
       client.writeQuery({
-        query: commitsQuery,
+        query: getCommits,
         data: { commits: newCommitData },
       });
 
diff --git a/app/assets/javascripts/repository/mixins/get_ref.js b/app/assets/javascripts/repository/mixins/get_ref.js
index 1f1880a48c7..99d19b77c35 100644
--- a/app/assets/javascripts/repository/mixins/get_ref.js
+++ b/app/assets/javascripts/repository/mixins/get_ref.js
@@ -1,9 +1,9 @@
-import refQuery from '../queries/ref.query.graphql';
+import getRef from '../queries/getRef.query.graphql';
 
 export default {
   apollo: {
     ref: {
-      query: refQuery,
+      query: getRef,
       manual: true,
       result({ data, loading }) {
         if (!loading) {
diff --git a/app/assets/javascripts/repository/mixins/preload.js b/app/assets/javascripts/repository/mixins/preload.js
index cb1d7f3aac9..cb6c2294679 100644
--- a/app/assets/javascripts/repository/mixins/preload.js
+++ b/app/assets/javascripts/repository/mixins/preload.js
@@ -1,12 +1,12 @@
-import filesQuery from '../queries/files.query.graphql';
+import getFiles from '../queries/getFiles.query.graphql';
 import getRefMixin from './get_ref';
-import projectPathQuery from '../queries/project_path.query.graphql';
+import getProjectPath from '../queries/getProjectPath.query.graphql';
 
 export default {
   mixins: [getRefMixin],
   apollo: {
     projectPath: {
-      query: projectPathQuery,
+      query: getProjectPath,
     },
   },
   data() {
@@ -21,7 +21,7 @@ export default {
 
       return this.$apollo
         .query({
-          query: filesQuery,
+          query: getFiles,
           variables: {
             projectPath: this.projectPath,
             ref: this.ref,
diff --git a/app/assets/javascripts/repository/queries/commit.query.graphql b/app/assets/javascripts/repository/queries/getCommit.query.graphql
index d2c94733bb9..e4aeaaff8fe 100644
--- a/app/assets/javascripts/repository/queries/commit.query.graphql
+++ b/app/assets/javascripts/repository/queries/getCommit.query.graphql
@@ -1,6 +1,6 @@
 #import "ee_else_ce/repository/queries/commit.fragment.graphql"
 
-query Commit($fileName: String!, $type: String!, $path: String!) {
+query getCommit($fileName: String!, $type: String!, $path: String!) {
   commit(path: $path, fileName: $fileName, type: $type) @client {
     ...TreeEntryCommit
   }
diff --git a/app/assets/javascripts/repository/queries/commits.query.graphql b/app/assets/javascripts/repository/queries/getCommits.query.graphql
index 8747649f56f..0976b8f32d7 100644
--- a/app/assets/javascripts/repository/queries/commits.query.graphql
+++ b/app/assets/javascripts/repository/queries/getCommits.query.graphql
@@ -1,6 +1,6 @@
 #import "ee_else_ce/repository/queries/commit.fragment.graphql"
 
-query Commits {
+query getCommits {
   commits @client {
     ...TreeEntryCommit
   }
diff --git a/app/assets/javascripts/repository/queries/files.query.graphql b/app/assets/javascripts/repository/queries/getFiles.query.graphql
index 10843b0450f..2aaf5066b4a 100644
--- a/app/assets/javascripts/repository/queries/files.query.graphql
+++ b/app/assets/javascripts/repository/queries/getFiles.query.graphql
@@ -8,7 +8,7 @@ fragment TreeEntry on Entry {
   type
 }
 
-query Files(
+query getFiles(
   $projectPath: ID!
   $path: String
   $ref: String!
@@ -22,7 +22,7 @@ query Files(
           edges {
             node {
               ...TreeEntry
-              webPath
+              webUrl
             }
           }
           pageInfo {
@@ -45,7 +45,7 @@ query Files(
           edges {
             node {
               ...TreeEntry
-              webPath
+              webUrl
               lfsOid
             }
           }
diff --git a/app/assets/javascripts/repository/queries/permissions.query.graphql b/app/assets/javascripts/repository/queries/getPermissions.query.graphql
index 57976ca2689..092fa44e2d0 100644
--- a/app/assets/javascripts/repository/queries/permissions.query.graphql
+++ b/app/assets/javascripts/repository/queries/getPermissions.query.graphql
@@ -1,4 +1,4 @@
-query Permissions($projectPath: ID!) {
+query getPermissions($projectPath: ID!) {
   project(fullPath: $projectPath) {
     userPermissions {
       pushCode
diff --git a/app/assets/javascripts/repository/queries/getProjectPath.query.graphql b/app/assets/javascripts/repository/queries/getProjectPath.query.graphql
new file mode 100644
index 00000000000..74e73e07577
--- /dev/null
+++ b/app/assets/javascripts/repository/queries/getProjectPath.query.graphql
@@ -0,0 +1,3 @@
+query getProjectPath {
+  projectPath
+}
diff --git a/app/assets/javascripts/repository/queries/project_short_path.query.graphql b/app/assets/javascripts/repository/queries/getProjectShortPath.query.graphql
index e6abe9d78cd..34eb26598c2 100644
--- a/app/assets/javascripts/repository/queries/project_short_path.query.graphql
+++ b/app/assets/javascripts/repository/queries/getProjectShortPath.query.graphql
@@ -1,3 +1,3 @@
-query ProjectShortPath {
+query getProjectShortPath {
   projectShortPath @client
 }
diff --git a/app/assets/javascripts/repository/queries/readme.query.graphql b/app/assets/javascripts/repository/queries/getReadme.query.graphql
index 38ecc2e1bb2..cf056330133 100644
--- a/app/assets/javascripts/repository/queries/readme.query.graphql
+++ b/app/assets/javascripts/repository/queries/getReadme.query.graphql
@@ -1,4 +1,4 @@
-query Readme($url: String!) {
+query getReadme($url: String!) {
   readme(url: $url) @client {
     html
   }
diff --git a/app/assets/javascripts/repository/queries/ref.query.graphql b/app/assets/javascripts/repository/queries/getRef.query.graphql
index e3498acd688..91afb751626 100644
--- a/app/assets/javascripts/repository/queries/ref.query.graphql
+++ b/app/assets/javascripts/repository/queries/getRef.query.graphql
@@ -1,4 +1,4 @@
-query Ref {
+query getRef {
   ref @client
   escapedRef @client
 }
diff --git a/app/assets/javascripts/repository/queries/path_last_commit.query.graphql b/app/assets/javascripts/repository/queries/pathLastCommit.query.graphql
index 8dc00fd9c7b..f54f09fd647 100644
--- a/app/assets/javascripts/repository/queries/path_last_commit.query.graphql
+++ b/app/assets/javascripts/repository/queries/pathLastCommit.query.graphql
@@ -1,4 +1,4 @@
-query PathLastCommit($projectPath: ID!, $path: String, $ref: String!) {
+query pathLastCommit($projectPath: ID!, $path: String, $ref: String!) {
   project(fullPath: $projectPath) {
     repository {
       tree(path: $path, ref: $ref) {
@@ -8,14 +8,14 @@ query PathLastCommit($projectPath: ID!, $path: String, $ref: String!) {
           titleHtml
           description
           message
-          webPath
+          webUrl
           authoredDate
           authorName
           authorGravatar
           author {
             name
             avatarUrl
-            webPath
+            webUrl
           }
           signatureHtml
           pipelines(ref: $ref, first: 1) {
diff --git a/app/assets/javascripts/repository/queries/project_path.query.graphql b/app/assets/javascripts/repository/queries/project_path.query.graphql
deleted file mode 100644
index 462ae5382a1..00000000000
--- a/app/assets/javascripts/repository/queries/project_path.query.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-query ProjectPath {
-  projectPath
-}