diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-01 16:04:14 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-01 16:04:14 +0000 |
| commit | b947d6fede791b581095b5b5c98890effc1d499d (patch) | |
| tree | c615bb618f2c8845bf68fdf6299240a5d6bfe0bd /app/views | |
| parent | f2c5e9a00fc3415de8deee214d11271c86cf4e5e (diff) | |
| parent | e13dc680523c14c205c20c2cd299ad64c287cd23 (diff) | |
| download | gitlab-ce-b947d6fede791b581095b5b5c98890effc1d499d.tar.gz | |
Merge branch 'diff-make-obvious-cant-comment' into 'master'
Visually display that expanded diff lines cant be commented on
See merge request !9465
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/blob/diff.html.haml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/blob/diff.html.haml b/app/views/projects/blob/diff.html.haml index c48d9dd982c..d1d448f0d4c 100644 --- a/app/views/projects/blob/diff.html.haml +++ b/app/views/projects/blob/diff.html.haml @@ -9,20 +9,20 @@ - line_old = line_new - @form.offset - line_content = capture do %td.line_content.noteable_line{ class: line_class }==#{' ' * @form.indent}#{line} - %tr.line_holder{ id: line_old, class: line_class } + %tr.line_holder.diff-expanded{ id: line_old, class: line_class } - case diff_view - when :inline %td.old_line.diff-line-num{ data: { linenumber: line_old } } - %a{ href: "##{line_old}", data: { linenumber: line_old } } + %a{ href: "#", data: { linenumber: line_old }, disabled: true } %td.new_line.diff-line-num{ data: { linenumber: line_new } } - %a{ href: "##{line_new}", data: { linenumber: line_new } } + %a{ href: "#", data: { linenumber: line_new }, disabled: true } = line_content - when :parallel %td.old_line.diff-line-num{ data: { linenumber: line_old } } - %a{ href: "##{line_old}", data: { linenumber: line_old } } + %a{ href: "##{line_old}", data: { linenumber: line_old }, disabled: true } = line_content %td.new_line.diff-line-num{ data: { linenumber: line_new } } - %a{ href: "##{line_new}", data: { linenumber: line_new } } + %a{ href: "##{line_new}", data: { linenumber: line_new }, disabled: true } = line_content - if @form.unfold? && @form.bottom? && @form.to < @blob.lines.size |