summaryrefslogtreecommitdiff
path: root/app/helpers/diff_helper.rb
Commit message (Collapse)AuthorAgeFilesLines
* Don't use params[:view] directly.param-viewDouwe Maan2015-11-171-2/+6
|
* Small UI improvements to merge request pagesmall-ui-improvementsDmitriy Zaporozhets2015-11-061-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Correctly find last known blob for file deleted in MR.merge-request-deleted-fileDouwe Maan2015-10-201-1/+2
|
* Fix 500 error on compare pagefix-500-compareDmitriy Zaporozhets2015-10-011-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix bug when removed file was not appearing in merge request diffDmitriy Zaporozhets2015-09-301-0/+19
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix testsDmitriy Zaporozhets2015-09-031-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Disabled expansion of top/bottom blobs for new file diffsAlex Connor2015-05-211-0/+4
|
* Improve handling of large diffsAlex Lossent2015-05-051-5/+14
| | | | | | | | | | Diffs with a large number of changed lines time out (504 HTTP error) or generate a HTML page that's so heavy web browsers struggle with it. https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on commit line count so that only a safe portion is rendered. This was later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab. This patch re-introduces a safe limit on number of lines.
* Fix "Revspec not found" errors when viewing diffs in a forked project with ↵Stan Hu2015-04-271-2/+2
| | | | | | submodules Closes #1413
* Fix merge request comments on files with multiple commitsDominik Sander2015-04-151-1/+1
| | | | | | | | | | | | | | | | Having a merge request with a comments on a line which is then changed in a later commit prevented new comments from properly showing up in the merge request show page. * `Note#set_diff` do not use stored the diff when creating a new note in merge requests (we can not be sure the diff did not changed since the last comment on that line) * Do not rely just on `outdated?` of the first note when displaying comments of a MR in the discussion tab, but partition the active/outdated notes and display them all * In the inline changes tab just select the active notes, so an outdated note does not prevent an active one from being rendered * Just show active comments in the side-by-side changes tab
* Fix broken side-by-side diff view on merge request pageStan Hu2015-03-251-0/+4
| | | | Closes #1294
* Refactor buttonsDmitriy Zaporozhets2015-03-141-2/+2
|
* show diff in submodulesHeadless2015-01-191-0/+15
|
* Set of UI changes mostly for issue and merge requestDmitriy Zaporozhets2014-12-251-0/+18
| | | | | | | | | | * return edit/close buttons to old position (right of title) * make 'Issue #1' header smaller * move mr commits to separate tab * change inline/side diff switcher to buttons from tabs * make issue sidebar start with dicsussion block Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move organizing of comments to helper.Marin Jankovski2014-09-121-0/+14
|
* Remove unecesarry array operations.Marin Jankovski2014-09-121-9/+9
|
* Add comments on the side-by-side diff.Marin Jankovski2014-09-121-3/+9
|
* Fix typo.Marin Jankovski2014-09-091-1/+1
|
* Add line code to parallel diff for linking.Marin Jankovski2014-09-091-4/+4
|
* Use the new path to the partial, move the diff related methods to the new ↵Marin Jankovski2014-09-091-0/+11
| | | | helper.
* optimize show_diff_size_warning?Dmitriy Zaporozhets2014-09-081-5/+9
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactoring inside refactoring. We need to go deeperDmitriy Zaporozhets2014-09-081-4/+65
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use new diff parsing logicDmitriy Zaporozhets2014-09-081-3/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor diff suppress logic and diff viewsDmitriy Zaporozhets2014-07-151-0/+22
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status