Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42 | GitLab Bot | 2020-12-17 | 1 | -7/+11 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42 | GitLab Bot | 2020-11-19 | 1 | -2/+5 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42 | GitLab Bot | 2020-10-21 | 1 | -10/+0 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-3-stable-ee | GitLab Bot | 2020-08-20 | 1 | -1/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-02-17 | 1 | -1/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-09-24 | 1 | -7/+4 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-09-18 | 1 | -2/+2 |
| | |||||
* | Prettify additional modules (I through Z) | Mike Greiling | 2018-10-16 | 1 | -9/+25 |
| | |||||
* | remove all unused eslint-disable rules | Lukas Eipert | 2018-06-20 | 1 | -1/+1 |
| | |||||
* | Resolve ""Click to expand" link in collapsed diffs should be blue" | Annabel Gray | 2018-06-14 | 1 | -1/+1 |
| | |||||
* | require jQuery to be explicitly importedremove-jquery-globals | Mike Greiling | 2018-03-09 | 1 | -0/+1 |
| | |||||
* | Update to jQuery 3. | Jacob Schatz | 2018-02-20 | 1 | -1/+1 |
| | |||||
* | only show error if there is an errorfix-diff-flash | Simon Knox | 2018-02-20 | 1 | -1/+3 |
| | |||||
* | Replace $.get in single file diff with axios | Clement Ho | 2018-01-30 | 1 | -11/+15 |
| | |||||
* | Export old code into es6 modules | Filipa Lacerda | 2017-12-13 | 1 | -1/+2 |
| | |||||
* | Commenting on image diffs | Felipe Artur | 2017-10-07 | 1 | -1/+6 |
| | |||||
* | refactor SingleFileDiff class to ES module syntax | Mike Greiling | 2017-07-06 | 1 | -11/+1 |
| | |||||
* | refactor single_file_diff.js to use ES class syntax | Mike Greiling | 2017-07-06 | 1 | -18/+13 |
| | |||||
* | Remove IIFEs around several javascript classes | Mike Greiling | 2017-07-05 | 1 | -80/+78 |
| | |||||
* | Render add-diff-note button with server. | Bryce Johnson | 2017-06-29 | 1 | -0/+4 |
| | | | | | | | | | | This commit moves the rendering of the button back to the server, and shows/hides it using opacity rather than display. It also removes the transform applied to the button on hover (scale). Previously, both of these factors automatically triggered a reflow, which creates a performance bottleneck on pages with larger DOM size. MR: !12103 | ||||
* | Clean up diff rendering | Douwe Maan | 2017-05-23 | 1 | -1/+1 |
| | |||||
* | remove bind polyfill from single_file_diff.js | Mike Greiling | 2017-05-08 | 1 | -3/+1 |
| | |||||
* | replace implicit this == window with explicit binding | Mike Greiling | 2017-02-17 | 1 | -1/+1 |
| | |||||
* | Use a new class to keep old behavior | Filipa Lacerda | 2017-02-08 | 1 | -2/+2 |
| | |||||
* | resolve all x-spacing and no-spaced-x eslint violations | Mike Greiling | 2017-01-18 | 1 | -2/+2 |
| | |||||
* | resolve all padded-blocks eslint violations | Mike Greiling | 2017-01-18 | 1 | -3/+1 |
| | |||||
* | fixed commit diff linking and added specsfix/diff-title | Luke "Jared" Bennett | 2017-01-14 | 1 | -12/+10 |
| | |||||
* | resolve all instances of no-undef eslint rule violationsclean-no-undef | Mike Greiling | 2016-12-14 | 1 | -3/+4 |
| | |||||
* | re-apply MR !6285 "Added forceLoad ability to singleFileDiffs, added ↵ | Luke Bennett | 2016-12-02 | 1 | -8/+14 |
| | | | | | | callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found" Use url utility to retrieve hash | ||||
* | temporarily revert "Added forceLoad ability to singleFileDiffs, added ↵ | Mike Greiling | 2016-12-02 | 1 | -12/+7 |
| | | | | | | callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found" This reverts commit d2ee380816fa161d94da54c1f7e594c9a2ba2241. | ||||
* | explicitly disable eslint inlineexplicitly-disable-eslint-inline | Luke "Jared" Bennett | 2016-11-15 | 1 | -1/+1 |
| | |||||
* | Changed how resolving notes is rendered | Phil Hughes | 2016-11-10 | 1 | -6/+6 |
| | | | | Vue2 was taking the template out & then appending again. This changes that | ||||
* | Merge branch '21633-permalink-to-collapsed-diff-line-does-not-work' into ↵ | Fatih Acet | 2016-11-01 | 1 | -7/+12 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fixed anchoring diff lines in collapsed diffs ## What does this MR do? This MR adds the ability to `forceLoad` a collapsed diff from instantiation, on top of this, if it is force loaded, we can pass a callback function to be invoked when the content is loaded. Now when a MR is loaded, we check for a diff line anchor that is currently within a collapsed diff, we re-instantiate the `singleFileDiff` with the `forceLoad` option. We also pass a callback function that in responsible for highlighting and scrolling to the specified anchor. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? We currently cannot anchor link to collapsed diff lines as the do not auto-expand. ## Screenshots (if relevant) https://youtu.be/fZVLlP6kchw ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21633 See merge request !6285 | ||||
| * | Added forceLoad ability to singleFileDiffs, added callback to ↵21633-permalink-to-collapsed-diff-line-does-not-work | Luke Bennett | 2016-10-21 | 1 | -7/+12 |
| | | | | | | | | | | | | getContentHTML, added conditional force load if a collapsed diff line anchor is found Use url utility to retrieve hash | ||||
* | | disable ESLint for all JavaScript files | winniehell | 2016-10-26 | 1 | -0/+1 |
|/ | |||||
* | Updated diff toggle targets and added icon | Luke Bennett | 2016-09-03 | 1 | -3/+10 |
| | |||||
* | Fixed issue with expand diff not initializing resolve buttons | Phil Hughes | 2016-08-04 | 1 | -4/+5 |
| | |||||
* | Checks if DiffNotesApp is defined | Phil Hughes | 2016-08-01 | 1 | -3/+3 |
| | |||||
* | Moved method to compile components from window into diffnotesapp | Phil Hughes | 2016-08-01 | 1 | -3/+9 |
| | |||||
* | Updated issues with jump tp button | Phil Hughes | 2016-08-01 | 1 | -2/+5 |
| | | | | Fixed styling bugs | ||||
* | ES6ify all the things! | Fatih Acet | 2016-07-24 | 1 | -0/+77 |