diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-04 21:13:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-04 21:13:47 +0300 |
| commit | cc514c362bcd4b657bf6a6d1d37f5305952df363 (patch) | |
| tree | 695c721b87c573d843cfeb23be2183d65b8a9785 /app/assets | |
| parent | 7de116050af7a190085c01bbf819e48e708e8eb2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
3 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/javascripts/branches/components/graph_bar.vue b/app/assets/javascripts/branches/components/graph_bar.vue index 21cbcac820a..885db7651a1 100644 --- a/app/assets/javascripts/branches/components/graph_bar.vue +++ b/app/assets/javascripts/branches/components/graph_bar.vue @@ -62,7 +62,7 @@ export default { :class="[roundedClass, positionSideClass]" class="position-absolute bar js-graph-bar" ></div> - <span :class="textAlignmentClass" class="d-block pt-1 pr-1 count js-graph-count"> + <span :class="textAlignmentClass" class="gl-display-block gl-pt-1 gl-px-1 count js-graph-count"> {{ label }} </span> </div> diff --git a/app/assets/javascripts/vue_shared/components/source_viewer/queries/blame_data.query.graphql b/app/assets/javascripts/vue_shared/components/source_viewer/queries/blame_data.query.graphql index c497224cde3..0067a0ca0d9 100644 --- a/app/assets/javascripts/vue_shared/components/source_viewer/queries/blame_data.query.graphql +++ b/app/assets/javascripts/vue_shared/components/source_viewer/queries/blame_data.query.graphql @@ -1,10 +1,16 @@ #import "~/graphql_shared/fragments/author.fragment.graphql" -query getBlameData($fullPath: ID!, $filePath: String!, $fromLine: Int, $toLine: Int) { +query getBlameData( + $fullPath: ID! + $filePath: String! + $fromLine: Int + $toLine: Int + $ref: String! +) { project(fullPath: $fullPath) { id repository { - blobs(paths: [$filePath]) { + blobs(ref: $ref, paths: [$filePath]) { nodes { id blame(fromLine: $fromLine, toLine: $toLine) { diff --git a/app/assets/javascripts/vue_shared/components/source_viewer/source_viewer_new.vue b/app/assets/javascripts/vue_shared/components/source_viewer/source_viewer_new.vue index bc46f11ab2d..e62f38d9ca3 100644 --- a/app/assets/javascripts/vue_shared/components/source_viewer/source_viewer_new.vue +++ b/app/assets/javascripts/vue_shared/components/source_viewer/source_viewer_new.vue @@ -118,6 +118,7 @@ export default { const { data } = await this.$apollo.query({ query: blameDataQuery, variables: { + ref: this.currentRef, fullPath: this.projectPath, filePath: this.blob.path, fromLine: chunk.startingFrom + 1, |