diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-29 06:07:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-29 06:07:51 +0300 |
commit | d94ed2a46aad78435de66af05c84060ae78c8fc0 (patch) | |
tree | 19b057ae567e8bdd10289d290608362f466ca589 /app/assets | |
parent | e56fd471503e00167ca96e7792f75a0d1f3b7891 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/diffs/components/diff_table_cell.vue | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_table_cell.vue b/app/assets/javascripts/diffs/components/diff_table_cell.vue index 9544fbe9fc5..e0fb1226674 100644 --- a/app/assets/javascripts/diffs/components/diff_table_cell.vue +++ b/app/assets/javascripts/diffs/components/diff_table_cell.vue @@ -166,6 +166,7 @@ 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 24c6fec064a..e83450f2dbc 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -485,10 +485,6 @@ table.code { } } } - - &:not(.js-unfold-bottom) a::before { - content: attr(data-linenumber); - } } &.line_content { |