Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42 | GitLab Bot | 2022-01-20 | 1 | -4/+32 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42 | GitLab Bot | 2021-12-20 | 1 | -1/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42 | GitLab Bot | 2020-10-21 | 1 | -1/+1 |
| | |||||
* | Format vue files with prettier | Marcel van Remmerden | 2019-06-06 | 1 | -1/+1 |
| | | | | Add changelog file | ||||
* | Replaces CSS with utility class59841-show-commits | Filipa Lacerda | 2019-04-12 | 1 | -1/+1 |
| | |||||
* | Externalize strings from `/app/views/projects/diffs` | George Tsiolis | 2018-11-20 | 1 | -1/+1 |
| | |||||
* | Fix broken UI on commit discussions | Annabel Dunstone Gray | 2018-11-13 | 1 | -1/+1 |
| | |||||
* | Clean up diff rendering | Douwe Maan | 2017-05-23 | 1 | -1/+1 |
| | |||||
* | Add question mark to Gitlab::Diff::File predicate methods | Douwe Maan | 2017-05-23 | 1 | -1/+1 |
| | |||||
* | Link to outdated diff in older MR version from outdated diff discussion | Douwe Maan | 2017-04-08 | 1 | -2/+1 |
| | |||||
* | prevent diff unfolding link from appearing for deleted files | Mike Greiling | 2017-02-16 | 1 | -1/+1 |
| | |||||
* | only show diff unfolding link if there are more lines to show | Mike Greiling | 2017-02-16 | 1 | -2/+3 |
| | |||||
* | ensure linenumber data attribute is correct for the last line in a diff chunk26300-line-numbers-are-off-in-dynamically-loaded-diff-chunks | Mike Greiling | 2017-01-18 | 1 | -4/+3 |
| | |||||
* | ensure last line in diff block is contained within a table row element | Mike Greiling | 2017-01-18 | 1 | -1/+2 |
| | |||||
* | Fix expansion of discussions in diffdiff-line-comment-vuejs | Douwe Maan | 2016-08-18 | 1 | -3/+1 |
| | |||||
* | Improve performance of MR show page | Douwe Maan | 2016-08-18 | 1 | -9/+8 |
| | |||||
* | Add unfold links for Side-by-Side view | Tim Masliuchenko | 2016-08-04 | 1 | -3/+2 |
| | |||||
* | Add Discussion model to represent MR/diff discussiondiscussion-model | Douwe Maan | 2016-07-20 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' into faster-diffs | Douwe Maan | 2016-07-07 | 1 | -10/+5 |
|\ | | | | | | | | | | | | | | | | | # Conflicts: # app/helpers/notes_helper.rb # app/views/projects/diffs/_line.html.haml # app/views/projects/diffs/_parallel_view.html.haml # app/views/projects/diffs/_text_file.html.haml # features/steps/shared/diff_note.rb | ||||
| * | Display new diff notes and allow creation through the web interface | Douwe Maan | 2016-07-06 | 1 | -9/+4 |
| | | |||||
* | | Simplify HAML code using unless condition and nesting | Paco Guzman | 2016-07-06 | 1 | -2/+1 |
| | | | | | | Extract diff line data attributes to helper methods | ||||
* | | Moving up common html data attributes | Paco Guzman | 2016-07-06 | 1 | -1/+2 |
|/ | |||||
* | Use `@diff_notes_disabled` instead of `@comments_allowed` | Douwe Maan | 2016-05-13 | 1 | -1/+1 |
| | |||||
* | Extract LegacyDiffNote out of Note | Douwe Maan | 2016-05-13 | 1 | -5/+4 |
| | |||||
* | Move diff line to separate partialbackport-ee-premailer | Douwe Maan | 2016-03-19 | 1 | -19/+2 |
| | |||||
* | Use Gitlab::Git::DiffCollections | Jacob Vosmaer | 2016-03-03 | 1 | -1/+1 |
| | |||||
* | Emoji reponses on diffs aren't award emoji | Zeger-Jan van de Weg | 2016-02-19 | 1 | -2/+2 |
| | |||||
* | 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 | 1 | -3/+3 |
|/ | | | | blame and snippets | ||||
* | Properly highlight lines around '\ No newline at end of file' | Douwe Maan | 2016-01-20 | 1 | -0/+4 |
| | |||||
* | Move parallel diff logic to separate class | Douwe Maan | 2016-01-20 | 1 | -1/+1 |
| | |||||
* | Add inline diff markers in highlighted diffs. | Douwe Maan | 2016-01-14 | 1 | -1/+1 |
| | |||||
* | Make diff_line_content helper return a safe String. #3945 | Rubén Dávila | 2016-01-12 | 1 | -1/+1 |
| | |||||
* | Add some styling for syntax highlighting themes. #3945 | Rubén Dávila | 2016-01-07 | 1 | -1/+1 |
| | |||||
* | Force white theme when viewing diffs. #3945 | Rubén Dávila | 2016-01-06 | 1 | -1/+1 |
| | |||||
* | Use #html_safe instead of #raw in some diff views. #3945 | Rubén Dávila | 2016-01-06 | 1 | -2/+2 |
| | |||||
* | 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 | 1 | -3/+2 |
| | | | | | | * 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 | 1 | -2/+4 |
| | |||||
* | Fix and style the "Changes suppressed" link.rs-changes-suppressed-link | Robert Speicher | 2015-07-23 | 1 | -1/+2 |
| | |||||
* | Rename abilities to correspond contoller/model action namesrename-abilities | Dmitriy Zaporozhets | 2015-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | write_ was renamed to create_ modify_ was renamed to update_ So now in update action we have next code def create can?(current_user, :create_issue, @issue) end def update can?(current_user, :update_issue, @issue) end 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 | -2/+2 |
| | |||||
* | 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 | ||||
* | Don't show commit comment button when user is not signed in. | Douwe Maan | 2015-03-23 | 1 | -1/+1 |
| | |||||
* | Fix usage of diff file mode change | Dmitriy Zaporozhets | 2014-09-08 | 1 | -1/+1 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Refactoring inside refactoring. We need to go deeper | Dmitriy Zaporozhets | 2014-09-08 | 1 | -1/+1 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Refactor diff views | Dmitriy Zaporozhets | 2014-09-08 | 1 | -0/+36 |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> |