summaryrefslogtreecommitdiff
path: root/app/views/projects/diffs
Commit message (Expand)AuthorAgeFilesLines
* Fixes requested by Rémyimage-diffJacob Vosmaer2016-02-171-1/+1
* Use /raw/ requests for image diffsJacob Vosmaer2016-02-161-9/+9
* Eager-load image blob data in diffsfix/13458-eager-load-blob-dataRémy Coutable2016-02-161-0/+2
* Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-291-9/+13
* Merge branch 'fix-mr-diff-edit-button' into 'master' Robert Speicher2016-01-221-21/+19
|\
| * Fix MR diff 'Edit' buttonfix-mr-diff-edit-buttonDouwe Maan2016-01-211-21/+19
* | Merge branch 'fix-diff-comments' into 'master' Robert Speicher2016-01-221-1/+2
|\ \
| * | Restore diff commentsDouwe Maan2016-01-221-1/+2
| |/
* | Use consistent markup and styling for highlighting across blobs, diffs, blame...Douwe Maan2016-01-214-16/+16
|/
* Properly highlight lines around '\ No newline at end of file'Douwe Maan2016-01-202-0/+9
* Move parallel diff logic to separate classDouwe Maan2016-01-202-4/+4
* Merge branch 'master' into issue_3945Rubén Dávila2016-01-141-1/+1
|\
| * Update files/diffs to match new layoutDmitriy Zaporozhets2016-01-141-1/+1
* | More refactoring from last code review. #3945Rubén Dávila2016-01-141-1/+1
* | Add inline diff markers in highlighted diffs.Douwe Maan2016-01-142-3/+3
* | Refactor parallel_diff generation a bit.Douwe Maan2016-01-141-25/+18
* | Little refactor for usage of html_safe. #3945Rubén Dávila2016-01-131-2/+2
* | Use html_safe instead of raw. #3945Rubén Dávila2016-01-131-2/+2
* | Make diff_line_content helper return a safe String. #3945Rubén Dávila2016-01-121-1/+1
* | Fix broken specs. #3945Rubén Dávila2016-01-081-2/+2
* | Change strategy to highlight diffs. #3945Rubén Dávila2016-01-071-1/+1
* | Add some styling for syntax highlighting themes. #3945Rubén Dávila2016-01-072-2/+2
* | Force white theme when viewing diffs. #3945Rubén Dávila2016-01-062-2/+2
* | Use #html_safe instead of #raw in some diff views. #3945Rubén Dávila2016-01-062-4/+4
* | Fix broken spec and small refactor. #3945Rubén Dávila2015-12-301-1/+1
* | New implementation for highlighting diff files. #3945Rubén Dávila2015-12-302-7/+4
* | Add syntax highlighting to diff view. #3945Rubén Dávila2015-12-282-5/+9
|/
* Fix specs and behavior for LFS filesDouwe Maan2015-12-181-2/+2
* Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-181-1/+2
* Merge branch 'serve_lfs_object' into 'master' Douwe Maan2015-12-081-2/+2
|\
| * Rename blob helper, bump version of gitlab_git to 7.2.21.Marin Jankovski2015-12-071-2/+2
| * Add specs for showing lfs object in UI.Marin Jankovski2015-12-071-2/+2
| * Don't show diffs for lfs pointers.Marin Jankovski2015-12-041-2/+2
* | Fix 500 error when creating a merge request that removes a submoduleDouglas Barbosa Alexandre2015-12-041-2/+1
|/
* Merge branch 'ui/consistency' into 'master' Dmitriy Zaporozhets2015-12-021-6/+14
|\
| * Use file-type specific file icon in blame view and diff itemDouwe Maan2015-12-021-6/+14
* | Remove duplicated styling for center top menusDouwe Maan2015-12-021-1/+1
|/
* Don't use params[:view] directly.param-viewDouwe Maan2015-11-172-3/+2
* Small UI improvements to merge request pagesmall-ui-improvementsDmitriy Zaporozhets2015-11-061-1/+1
* Correctly find last known blob for file deleted in MR.merge-request-deleted-fileDouwe Maan2015-10-202-4/+4
* Make diff file view easier to use on mobile screensStan Hu2015-10-091-1/+1
* Avoid unnecessary usage of local varsshow-diff-stats-for-mrDmitriy Zaporozhets2015-10-012-6/+3
* Show additions/deletions stats on merge request diffDmitriy Zaporozhets2015-10-012-19/+20
* Fix bug when removed file was not appearing in merge request diffDmitriy Zaporozhets2015-09-302-15/+14
* Improve diff UI and mr compare pageDmitriy Zaporozhets2015-09-082-3/+3
* Limit content width for big screens except certain pagesDmitriy Zaporozhets2015-08-261-0/+3
* Fix "Reload with full diff" URL button in compare branch viewStan Hu2015-08-241-1/+1
* Merge branch 'fix-reload-with-full-diff-url' into 'master'Stan Hu2015-07-251-1/+1
|\
| * Fix the "Reload with full diff" URL buttonStan Hu2015-07-231-1/+1
* | Fix and style the "Changes suppressed" link.rs-changes-suppressed-linkRobert Speicher2015-07-231-1/+2
|/
View Lorry Controller Status