diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-02-03 17:19:02 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-02-03 17:19:02 -0600 |
| commit | 7039d52349610a625efeafa32898a7763b4dbdb6 (patch) | |
| tree | 145a995b6f11531e9a70bf977e813f153ea782b6 /app/views/projects/blob | |
| parent | 04dc2b76d7e382a6b6369576753cfc20928c99b8 (diff) | |
| parent | aa9e77b7ce5a1ceeff6188e5d12e5fcb2589d2f1 (diff) | |
| download | gitlab-ce-7039d52349610a625efeafa32898a7763b4dbdb6.tar.gz | |
Merge branch 'master' into go-go-gadget-webpack
* master:
Change window size before visiting page, to get correct scroll position
Fix slash commands spec error
Move project services to new location under Integrations
Move webhooks to new a location under Integrations
Fixed eslint test failure
Fixed redirection from http://someproject.git to http://someproject
Add traits for the different Event types to the Event factory
prevent nonewline type diff lines from containing unfolding link
ensure linenumber data attribute is correct for the last line in a diff chunk
ensure last line in diff block is contained within a table row element
ensure click event is bound only once
Diffstat (limited to 'app/views/projects/blob')
| -rw-r--r-- | app/views/projects/blob/diff.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/blob/diff.html.haml b/app/views/projects/blob/diff.html.haml index 538f8591f13..3b1a2e54ec2 100644 --- a/app/views/projects/blob/diff.html.haml +++ b/app/views/projects/blob/diff.html.haml @@ -27,4 +27,4 @@ - if @form.unfold? && @form.bottom? && @form.to < @blob.loc %tr.line_holder{ id: @form.to, class: line_class } - = diff_match_line @form.to, @form.to, text: @match_line, view: diff_view, bottom: true + = diff_match_line @form.to - @form.offset, @form.to, text: @match_line, view: diff_view, bottom: true |