diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 18:09:23 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 18:09:23 +0000 |
| commit | 76e9fc7b29c1ce716c26932e9fbec0f3c99f53f4 (patch) | |
| tree | b5ca8e3a6b2cf93b67257b38ee71e2efee177700 /app/assets | |
| parent | a210c43e0aca0311cc1d3d381763b25979ec72dc (diff) | |
| download | gitlab-ce-76e9fc7b29c1ce716c26932e9fbec0f3c99f53f4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/deploy_keys/components/key.vue | 9 | ||||
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_table_cell.vue | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/app/assets/javascripts/deploy_keys/components/key.vue b/app/assets/javascripts/deploy_keys/components/key.vue index c856e380c41..585b091bc51 100644 --- a/app/assets/javascripts/deploy_keys/components/key.vue +++ b/app/assets/javascripts/deploy_keys/components/key.vue @@ -1,5 +1,5 @@ <script> -import _ from 'underscore'; +import { head, tail } from 'lodash'; import { s__, sprintf } from '~/locale'; import icon from '~/vue_shared/components/icon.vue'; import tooltip from '~/vue_shared/directives/tooltip'; @@ -48,8 +48,7 @@ export default { const projects = [...this.deployKey.deploy_keys_projects]; if (this.projectId !== null) { - const indexOfCurrentProject = _.findIndex( - projects, + const indexOfCurrentProject = projects.findIndex( project => project && project.project && @@ -66,10 +65,10 @@ export default { return projects; }, firstProject() { - return _.head(this.projects); + return head(this.projects); }, restProjects() { - return _.tail(this.projects); + return tail(this.projects); }, restProjectsTooltip() { return sprintf(s__('DeployKeys|Expand %{count} other projects'), { diff --git a/app/assets/javascripts/diffs/components/diff_table_cell.vue b/app/assets/javascripts/diffs/components/diff_table_cell.vue index e0fb1226674..9544fbe9fc5 100644 --- a/app/assets/javascripts/diffs/components/diff_table_cell.vue +++ b/app/assets/javascripts/diffs/components/diff_table_cell.vue @@ -166,7 +166,6 @@ export default { :href="lineHref" @click="setHighlightedRow(lineCode)" > - {{ lineNumber }} </a> <diff-gutter-avatars v-if="shouldShowAvatarsOnGutter" diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index e83450f2dbc..24c6fec064a 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -485,6 +485,10 @@ table.code { } } } + + &:not(.js-unfold-bottom) a::before { + content: attr(data-linenumber); + } } &.line_content { |