| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Use Gitlab::Git::DiffCollections | Jacob Vosmaer | 2016-03-03 | 3 | -11/+4 |
| | | |||||
| * | Changed too many changes buttons to whitetoo-many-changes-btns | Phil Hughes | 2016-02-29 | 1 | -6/+5 |
| | | | | | Closes #13751 | ||||
| * | Emoji reponses on diffs aren't award emoji | Zeger-Jan van de Weg | 2016-02-19 | 1 | -2/+2 |
| | | |||||
| * | Fixes requested by Rémyimage-diff | Jacob Vosmaer | 2016-02-17 | 1 | -1/+1 |
| | | |||||
| * | Use /raw/ requests for image diffs | Jacob Vosmaer | 2016-02-16 | 1 | -9/+9 |
| | | |||||
| * | Eager-load image blob data in diffsfix/13458-eager-load-blob-data | Rémy Coutable | 2016-02-16 | 1 | -0/+2 |
| | | | | | | | | Since gitlab_git 8.0, blob data are lazy-loaded so we have to call blob.load_all_data!(repo) to eager-load them. Fixes #13458. | ||||
| * | Mark inline difference between old and new paths when a file is renamed | Douwe Maan | 2016-01-29 | 1 | -9/+13 |
| | | |||||
| * | Merge branch 'fix-mr-diff-edit-button' into 'master' | Robert Speicher | 2016-01-22 | 1 | -21/+19 |
| |\ | | | | | | | | | | | | | Fix MR diff 'Edit' button It now works and has the right size. See merge request !2542 | ||||
| | * | Fix MR diff 'Edit' buttonfix-mr-diff-edit-button | Douwe Maan | 2016-01-21 | 1 | -21/+19 |
| | | | |||||
| * | | Merge branch 'fix-diff-comments' into 'master' | Robert Speicher | 2016-01-22 | 1 | -1/+2 |
| |\ \ | | | | | | | | | | | | | More highlighted diff fixes See merge request !2545 | ||||
| | * | | Restore diff comments | Douwe Maan | 2016-01-22 | 1 | -1/+2 |
| | |/ | |||||
| * | | Use consistent markup and styling for highlighting across blobs, diffs, ↵ | Douwe Maan | 2016-01-21 | 4 | -16/+16 |
| |/ | | | | blame and snippets | ||||
| * | Properly highlight lines around '\ No newline at end of file' | Douwe Maan | 2016-01-20 | 2 | -0/+9 |
| | | |||||
| * | Move parallel diff logic to separate class | Douwe Maan | 2016-01-20 | 2 | -4/+4 |
| | | |||||
| * | Merge branch 'master' into issue_3945 | Rubén Dávila | 2016-01-14 | 1 | -1/+1 |
| |\ | |||||
| | * | Update files/diffs to match new layout | Dmitriy Zaporozhets | 2016-01-14 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | More refactoring from last code review. #3945 | Rubén Dávila | 2016-01-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | * Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs | ||||
| * | | Add inline diff markers in highlighted diffs. | Douwe Maan | 2016-01-14 | 2 | -3/+3 |
| | | | |||||
| * | | Refactor parallel_diff generation a bit. | Douwe Maan | 2016-01-14 | 1 | -25/+18 |
| | | | |||||
| * | | Little refactor for usage of html_safe. #3945 | Rubén Dávila | 2016-01-13 | 1 | -2/+2 |
| | | | |||||
| * | | Use html_safe instead of raw. #3945 | Rubén Dávila | 2016-01-13 | 1 | -2/+2 |
| | | | |||||
| * | | Make diff_line_content helper return a safe String. #3945 | Rubén Dávila | 2016-01-12 | 1 | -1/+1 |
| | | | |||||
| * | | Fix broken specs. #3945 | Rubén Dávila | 2016-01-08 | 1 | -2/+2 |
| | | | |||||
| * | | Change strategy to highlight diffs. #3945 | Rubén Dávila | 2016-01-07 | 1 | -1/+1 |
| | | | | | | | | | | | Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content. | ||||
| * | | Add some styling for syntax highlighting themes. #3945 | Rubén Dávila | 2016-01-07 | 2 | -2/+2 |
| | | | |||||
| * | | Force white theme when viewing diffs. #3945 | Rubén Dávila | 2016-01-06 | 2 | -2/+2 |
| | | | |||||
| * | | Use #html_safe instead of #raw in some diff views. #3945 | Rubén Dávila | 2016-01-06 | 2 | -4/+4 |
| | | | |||||
| * | | Fix broken spec and small refactor. #3945 | Rubén Dávila | 2015-12-30 | 1 | -1/+1 |
| | | | |||||
| * | | New implementation for highlighting diff files. #3945 | Rubén Dávila | 2015-12-30 | 2 | -7/+4 |
| | | | | | | | | | | | | | * It is more performant given now we process all the diff file instead of processing line by line. * Multiline comments are highlighted correctly. | ||||
| * | | Add syntax highlighting to diff view. #3945 | Rubén Dávila | 2015-12-28 | 2 | -5/+9 |
| |/ | |||||
| * | Fix specs and behavior for LFS files | Douwe Maan | 2015-12-18 | 1 | -2/+2 |
| | | |||||
| * | Automatically fork a project when not allowed to edit a file. | Douwe Maan | 2015-12-18 | 1 | -1/+2 |
| | | |||||
| * | Merge branch 'serve_lfs_object' into 'master' | Douwe Maan | 2015-12-08 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976 | ||||
| | * | Rename blob helper, bump version of gitlab_git to 7.2.21. | Marin Jankovski | 2015-12-07 | 1 | -2/+2 |
| | | | |||||
| | * | Add specs for showing lfs object in UI. | Marin Jankovski | 2015-12-07 | 1 | -2/+2 |
| | | | |||||
| | * | Don't show diffs for lfs pointers. | Marin Jankovski | 2015-12-04 | 1 | -2/+2 |
| | | | |||||
| * | | Fix 500 error when creating a merge request that removes a submodule | Douglas Barbosa Alexandre | 2015-12-04 | 1 | -2/+1 |
| |/ | |||||
| * | Merge branch 'ui/consistency' into 'master' | Dmitriy Zaporozhets | 2015-12-02 | 1 | -6/+14 |
| |\ | | | | | | | | | | | | | | | | | | | | | UI: Improve consistency across the board Depends on !1953 See the commits for more details, the messages mostly speak for themselves. Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2577 See merge request !1954 | ||||
| | * | Use file-type specific file icon in blame view and diff item | Douwe Maan | 2015-12-02 | 1 | -6/+14 |
| | | | |||||
| * | | Remove duplicated styling for center top menus | Douwe Maan | 2015-12-02 | 1 | -1/+1 |
| |/ | |||||
| * | Don't use params[:view] directly.param-view | Douwe Maan | 2015-11-17 | 2 | -3/+2 |
| | | |||||
| * | Small UI improvements to merge request pagesmall-ui-improvements | Dmitriy Zaporozhets | 2015-11-06 | 1 | -1/+1 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Correctly find last known blob for file deleted in MR.merge-request-deleted-file | Douwe Maan | 2015-10-20 | 2 | -4/+4 |
| | | |||||
| * | Make diff file view easier to use on mobile screens | Stan Hu | 2015-10-09 | 1 | -1/+1 |
| | | |||||
| * | Avoid unnecessary usage of local varsshow-diff-stats-for-mr | Dmitriy Zaporozhets | 2015-10-01 | 2 | -6/+3 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Show additions/deletions stats on merge request diff | Dmitriy Zaporozhets | 2015-10-01 | 2 | -19/+20 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Fix bug when removed file was not appearing in merge request diff | Dmitriy Zaporozhets | 2015-09-30 | 2 | -15/+14 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Improve diff UI and mr compare page | Dmitriy Zaporozhets | 2015-09-08 | 2 | -3/+3 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Limit content width for big screens except certain pages | Dmitriy Zaporozhets | 2015-08-26 | 1 | -0/+3 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Fix "Reload with full diff" URL button in compare branch view | Stan Hu | 2015-08-24 | 1 | -1/+1 |
| | | | | | | | This button worked when viewing merge requests because the JavaScript stripped the .html in the Ajax request. However, it left the .html suffix in the compare branch view. | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |