summaryrefslogtreecommitdiff
path: root/app/views/projects/diffs/_text_file.html.haml
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42GitLab Bot2022-01-201-4/+32
|
* Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42GitLab Bot2021-12-201-1/+1
|
* Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42GitLab Bot2020-10-211-1/+1
|
* Format vue files with prettierMarcel van Remmerden2019-06-061-1/+1
| | | | Add changelog file
* Replaces CSS with utility class59841-show-commitsFilipa Lacerda2019-04-121-1/+1
|
* Externalize strings from `/app/views/projects/diffs`George Tsiolis2018-11-201-1/+1
|
* Fix broken UI on commit discussionsAnnabel Dunstone Gray2018-11-131-1/+1
|
* Clean up diff renderingDouwe Maan2017-05-231-1/+1
|
* Add question mark to Gitlab::Diff::File predicate methodsDouwe Maan2017-05-231-1/+1
|
* Link to outdated diff in older MR version from outdated diff discussionDouwe Maan2017-04-081-2/+1
|
* prevent diff unfolding link from appearing for deleted filesMike Greiling2017-02-161-1/+1
|
* only show diff unfolding link if there are more lines to showMike Greiling2017-02-161-2/+3
|
* ensure linenumber data attribute is correct for the last line in a diff chunk26300-line-numbers-are-off-in-dynamically-loaded-diff-chunksMike Greiling2017-01-181-4/+3
|
* ensure last line in diff block is contained within a table row elementMike Greiling2017-01-181-1/+2
|
* Fix expansion of discussions in diffdiff-line-comment-vuejsDouwe Maan2016-08-181-3/+1
|
* Improve performance of MR show pageDouwe Maan2016-08-181-9/+8
|
* Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-041-3/+2
|
* Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-201-3/+3
|
* Merge branch 'master' into faster-diffsDouwe Maan2016-07-071-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 interfaceDouwe Maan2016-07-061-9/+4
| |
* | Simplify HAML code using unless condition and nestingPaco Guzman2016-07-061-2/+1
| | | | | | Extract diff line data attributes to helper methods
* | Moving up common html data attributesPaco Guzman2016-07-061-1/+2
|/
* Use `@diff_notes_disabled` instead of `@comments_allowed`Douwe Maan2016-05-131-1/+1
|
* Extract LegacyDiffNote out of NoteDouwe Maan2016-05-131-5/+4
|
* Move diff line to separate partialbackport-ee-premailerDouwe Maan2016-03-191-19/+2
|
* Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-031-1/+1
|
* Emoji reponses on diffs aren't award emojiZeger-Jan van de Weg2016-02-191-2/+2
|
* Merge branch 'fix-diff-comments' into 'master' Robert Speicher2016-01-221-1/+2
|\ | | | | | | | | More highlighted diff fixes See merge request !2545
| * Restore diff commentsDouwe Maan2016-01-221-1/+2
| |
* | Use consistent markup and styling for highlighting across blobs, diffs, ↵Douwe Maan2016-01-211-3/+3
|/ | | | blame and snippets
* Properly highlight lines around '\ No newline at end of file'Douwe Maan2016-01-201-0/+4
|
* Move parallel diff logic to separate classDouwe Maan2016-01-201-1/+1
|
* Add inline diff markers in highlighted diffs.Douwe Maan2016-01-141-1/+1
|
* Make diff_line_content helper return a safe String. #3945Rubén Dávila2016-01-121-1/+1
|
* Add some styling for syntax highlighting themes. #3945Rubén Dávila2016-01-071-1/+1
|
* Force white theme when viewing diffs. #3945Rubén Dávila2016-01-061-1/+1
|
* Use #html_safe instead of #raw in some diff views. #3945Rubén Dávila2016-01-061-2/+2
|
* 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-301-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. #3945Rubén Dávila2015-12-281-2/+4
|
* Fix and style the "Changes suppressed" link.rs-changes-suppressed-linkRobert Speicher2015-07-231-1/+2
|
* Rename abilities to correspond contoller/model action namesrename-abilitiesDmitriy Zaporozhets2015-06-261-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 diffsAlex Connor2015-05-211-2/+2
|
* 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
* Don't show commit comment button when user is not signed in.Douwe Maan2015-03-231-1/+1
|
* Fix usage of diff file mode changeDmitriy Zaporozhets2014-09-081-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactoring inside refactoring. We need to go deeperDmitriy Zaporozhets2014-09-081-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor diff viewsDmitriy Zaporozhets2014-09-081-0/+36
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>