| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Link to outdated diff in older MR version from outdated diff discussion | Douwe Maan | 2017-04-08 | 1 | -2/+1 |
| | | |||||
| * | Correctly display multiple separate discussions on the same diff line | Douwe Maan | 2017-04-05 | 1 | -3/+5 |
| | | |||||
| * | take nonewline context into account in diff parser | mhasbini | 2017-03-13 | 1 | -2/+2 |
| | | |||||
| * | Fixed bugs with diff comment avatars | Phil Hughes | 2017-03-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | The comment button on commit view was way out to the left side because the element that renders the diff avatars was rendering when it shouldnt be When commenting on a discussion on the discussions tab it would try to render the avatar & in some cases work correctly even though it shouldnt be possible for this to happen. Changed the if statement to take this into account Closes #29237, #29238, #29243 | ||||
| * | Added discussion comments avatars to diff | Phil Hughes | 2017-03-08 | 1 | -6/+11 |
| | | |||||
| * | 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 |
| | | |||||
| * | Merge branch '26300-line-numbers-are-off-in-dynamically-loaded-diff-chunks' ↵ | Jacob Schatz | 2017-02-03 | 1 | -4/+4 |
| |\ | | | | | | | | | | | | | | | | | into 'master' Resolve "Line numbers are off in dynamically loaded diff chunks" Closes #26300 See merge request !8428 | ||||
| | * | 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 |
| | | | |||||
| * | | Merge branch ↵ | Jacob Schatz | 2017-02-03 | 1 | -2/+10 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26829-diff-unfolding-links-erroneously-present-on-no-newline-lines' into 'master' Prevent "nonewline" type diff lines from showing a diff unfolding link Closes #26829 See merge request !8632 | ||||
| | * | | prevent nonewline type diff lines from containing unfolding link26829-diff-unfolding-links-erroneously-present-on-no-newline-lines | Mike Greiling | 2017-01-18 | 1 | -2/+10 |
| | |/ | |||||
| * | | Prevent copying of line numbers in parallel diff view27021-line-numbers-now-in-copy-pasta-data | samrose3 | 2017-01-22 | 1 | -2/+2 |
| |/ | |||||
| * | HAMLLint: Fix `SpaceInsideHashAttributes` offences | Kushal Pandya | 2016-12-31 | 1 | -6/+6 |
| | | |||||
| * | HAMLLint: Fix `ImplicitDiv` offences | Kushal Pandya | 2016-12-31 | 1 | -1/+1 |
| | | |||||
| * | Fix horizontal padding for highlight blocks23661-lacking-padding-on-syntax-highlight-blocks-in-diff-comments | Luke Bennett | 2016-10-25 | 1 | -1/+1 |
| | | |||||
| * | Add unfold links for Side-by-Side view | Tim Masliuchenko | 2016-08-04 | 1 | -4/+6 |
| | | |||||
| * | Add Discussion model to represent MR/diff discussiondiscussion-model | Douwe Maan | 2016-07-20 | 1 | -24/+27 |
| | | |||||
| * | Registered FilesCommentButton as a jQuery plugin and made review changes | Luke "Jared" Bennett | 2016-07-08 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' into faster-diffs | Douwe Maan | 2016-07-07 | 1 | -11/+9 |
| |\ | | | | | | | | | | | | | | | | | # 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 | ||||
| | * | Use HAML class syntax in diff line partials | Douwe Maan | 2016-07-07 | 1 | -4/+4 |
| | | | |||||
| | * | Display new diff notes and allow creation through the web interface | Douwe Maan | 2016-07-06 | 1 | -8/+6 |
| | | | |||||
| * | | Simplify HAML code using unless condition and nesting | Paco Guzman | 2016-07-06 | 1 | -6/+5 |
| | | | | | | | Extract diff line data attributes to helper methods | ||||
| * | | Moving up common html data attributes | Paco Guzman | 2016-07-06 | 1 | -3/+3 |
| | | | |||||
| * | | Diffs will create button/diff form on demand no on server side | Jacob Schatz | 2016-07-06 | 1 | -15/+11 |
| |/ | |||||
| * | Use `@diff_notes_disabled` instead of `@comments_allowed` | Douwe Maan | 2016-05-13 | 1 | -3/+3 |
| | | |||||
| * | Extract LegacyDiffNote out of Note | Douwe Maan | 2016-05-13 | 1 | -5/+5 |
| | | |||||
| * | Diff viewer links to correct part of the file | Phil Hughes | 2016-04-14 | 1 | -4/+4 |
| | | | | | | | Added highlight colours to diff rows Closes #13852 | ||||
| * | Use consistent markup and styling for highlighting across blobs, diffs, ↵ | Douwe Maan | 2016-01-21 | 1 | -8/+8 |
| | | | | | blame and snippets | ||||
| * | Properly highlight lines around '\ No newline at end of file' | Douwe Maan | 2016-01-20 | 1 | -0/+5 |
| | | |||||
| * | Move parallel diff logic to separate class | Douwe Maan | 2016-01-20 | 1 | -3/+3 |
| | | |||||
| * | Add inline diff markers in highlighted diffs. | Douwe Maan | 2016-01-14 | 1 | -2/+2 |
| | | |||||
| * | 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 |
| | | |||||
| * | Fix broken specs. #3945 | Rubén Dávila | 2016-01-08 | 1 | -2/+2 |
| | | |||||
| * | 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 |
| | | |||||
| * | New implementation for highlighting diff files. #3945 | Rubén Dávila | 2015-12-30 | 1 | -4/+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 | -3/+5 |
| | | |||||
| * | Rename abilities to correspond contoller/model action namesrename-abilities | Dmitriy Zaporozhets | 2015-06-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | 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> | ||||
| * | Support commenting on a diff in side-by-side view | Stan Hu | 2015-06-16 | 1 | -1/+5 |
| | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9283 | ||||
| * | Move organizing of comments to helper. | Marin Jankovski | 2014-09-12 | 1 | -14/+8 |
| | | |||||
| * | Remove unecesarry array operations. | Marin Jankovski | 2014-09-12 | 1 | -6/+6 |
| | | |||||
| * | Add comments on the side-by-side diff. | Marin Jankovski | 2014-09-12 | 1 | -8/+28 |
| | | |||||
| * | Wrap should always be enabled for parallel diff. | Marin Jankovski | 2014-09-10 | 1 | -1/+1 |
| | | |||||
| * | Add line code to parallel diff for linking. | Marin Jankovski | 2014-09-09 | 1 | -8/+9 |
| | | |||||
| * | Refactor diff views | Dmitriy Zaporozhets | 2014-09-08 | 1 | -0/+26 |
| Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |