| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Extract LegacyDiffNote out of Note | Douwe Maan | 2016-05-13 | 1 | -13/+9 |
| | | |||||
| * | Allow to pass custom classes to button | Alfredo Sumaran | 2016-04-26 | 1 | -6/+9 |
| | | |||||
| * | Hide button on mobile | Alfredo Sumaran | 2016-04-26 | 1 | -1/+1 |
| | | |||||
| * | Syntax and code improvements | Alfredo Sumaran | 2016-04-26 | 1 | -11/+13 |
| | | |||||
| * | Rename method | Alfredo Sumaran | 2016-04-26 | 1 | -4/+4 |
| | | |||||
| * | Use new method hide_whitespaces? | Alfredo Sumaran | 2016-04-26 | 1 | -1/+1 |
| | | |||||
| * | Add Hide/show whitespace changes button on diff and commit view | Alfredo Sumaran | 2016-04-26 | 1 | -0/+22 |
| | | |||||
| * | Always read diff_view setting from the cookie | Robert Speicher | 2016-04-14 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | Prior, when the user had their view set to "parallel" and then visited a merge request's changes tab _without_ passing the `view` parameter via query string, the view would be parallel but the `Notes` class was always instantiated with the default value from `diff_view` ("inline"), resulting in broken markup when the form to add a line note was dynamically inserted. The cookie is set whenever the view is changed, so this value should always be up-to-date. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 | ||||
| * | Syntax & style updates14176-diff-paste-data | Annabel Dunstone | 2016-04-14 | 1 | -3/+1 |
| | | |||||
| * | Add line type conditional to diff line helper | Annabel Dunstone | 2016-04-14 | 1 | -2/+4 |
| | | |||||
| * | Copying and pasting doesn't grab line numbers or +/- | Annabel Dunstone | 2016-04-14 | 1 | -0/+1 |
| | | |||||
| * | Use Gitlab::Git::DiffCollections | Jacob Vosmaer | 2016-03-03 | 1 | -27/+7 |
| | | |||||
| * | Fixes syntax error | Alfredo Sumaran | 2016-02-19 | 1 | -1/+1 |
| | | |||||
| * | Make diff view name getter less error prone | Alfredo Sumaran | 2016-02-19 | 1 | -1/+1 |
| | | |||||
| * | Sort line notes used in parallel diff by created_at | Rémy Coutable | 2016-02-17 | 1 | -1/+1 |
| | | | | | Fixes #13464. | ||||
| * | Fewer html_safesrename-inline-diff | Douwe Maan | 2016-01-30 | 1 | -2/+2 |
| | | |||||
| * | Mark inline difference between old and new paths when a file is renamed | Douwe Maan | 2016-01-29 | 1 | -1/+10 |
| | | |||||
| * | Save and use actual diff base commit for MR diff highlighting | Douwe Maan | 2016-01-20 | 1 | -2/+1 |
| | | |||||
| * | Restore helper | Douwe Maan | 2016-01-20 | 1 | -0/+4 |
| | | |||||
| * | Move parallel diff logic to separate class | Douwe Maan | 2016-01-20 | 1 | -104/+0 |
| | | |||||
| * | More refactoring from last code review. #3945 | Rubén Dávila | 2016-01-14 | 1 | -2/+2 |
| | | | | | | | * Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs | ||||
| * | Refactor parallel_diff generation a bit. | Douwe Maan | 2016-01-14 | 1 | -23/+63 |
| | | |||||
| * | Little refactor for usage of html_safe. #3945 | Rubén Dávila | 2016-01-13 | 1 | -4/+5 |
| | | |||||
| * | Fix broken spec. #3945 | Rubén Dávila | 2016-01-12 | 1 | -1/+2 |
| | | |||||
| * | Make diff_line_content helper return a safe String. #3945 | Rubén Dávila | 2016-01-12 | 1 | -2/+2 |
| | | |||||
| * | Change strategy to highlight diffs. #3945 | Rubén Dávila | 2016-01-07 | 1 | -2/+2 |
| | | | | | | Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content. | ||||
| * | Fix broken spec and small refactor. #3945 | Rubén Dávila | 2015-12-30 | 1 | -2/+2 |
| | | |||||
| * | New implementation for highlighting diff files. #3945 | Rubén Dávila | 2015-12-30 | 1 | -3/+3 |
| | | | | | | | * It is more performant given now we process all the diff file instead of processing line by line. * Multiline comments are highlighted correctly. | ||||
| * | Truncate submodule commit SHAs to 7 characters | Douwe Maan | 2015-12-02 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'compare-first-commit' into 'master' | Robert Speicher | 2015-11-17 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Correctly set comparison first commit when range includes a merge commit Fixes #3207. See merge request !1814 | ||||
| | * | Correctly set comparison first commit when range includes a merge commitcompare-first-commit | Douwe Maan | 2015-11-17 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'remove-code-duplication' | Dmitriy Zaporozhets | 2015-11-17 | 1 | -16/+16 |
| |\ \ | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Remove duplication in diff_helper.rb | Dmitriy Zaporozhets | 2015-11-17 | 1 | -16/+16 |
| | |/ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Don't use params[:view] directly.param-view | Douwe Maan | 2015-11-17 | 1 | -2/+6 |
| |/ | |||||
| * | Small UI improvements to merge request pagesmall-ui-improvements | Dmitriy Zaporozhets | 2015-11-06 | 1 | -2/+2 |
| | | | | | 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 | 1 | -1/+2 |
| | | |||||
| * | Fix 500 error on compare pagefix-500-compare | Dmitriy Zaporozhets | 2015-10-01 | 1 | -1/+1 |
| | | | | | 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 | 1 | -0/+19 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Fix tests | Dmitriy Zaporozhets | 2015-09-03 | 1 | -2/+2 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Disabled expansion of top/bottom blobs for new file diffs | Alex Connor | 2015-05-21 | 1 | -0/+4 |
| | | |||||
| * | Improve handling of large diffs | Alex Lossent | 2015-05-05 | 1 | -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 Hu | 2015-04-27 | 1 | -2/+2 |
| | | | | | | | submodules Closes #1413 | ||||
| * | Fix merge request comments on files with multiple commits | Dominik Sander | 2015-04-15 | 1 | -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 page | Stan Hu | 2015-03-25 | 1 | -0/+4 |
| | | | | | Closes #1294 | ||||
| * | Refactor buttons | Dmitriy Zaporozhets | 2015-03-14 | 1 | -2/+2 |
| | | |||||
| * | show diff in submodules | Headless | 2015-01-19 | 1 | -0/+15 |
| | | |||||
| * | Set of UI changes mostly for issue and merge request | Dmitriy Zaporozhets | 2014-12-25 | 1 | -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 Jankovski | 2014-09-12 | 1 | -0/+14 |
| | | |||||
| * | Remove unecesarry array operations. | Marin Jankovski | 2014-09-12 | 1 | -9/+9 |
| | | |||||
| * | Add comments on the side-by-side diff. | Marin Jankovski | 2014-09-12 | 1 | -3/+9 |
| | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |