39b47b75cf
Add latest changes from gitlab-org/gitlab@master
2024-04-24 18:10:01 +00:00
88741f7df9
Add latest changes from gitlab-org/gitlab@master
2023-11-04 09:10:05 +00:00
bdad4dd5da
Add latest changes from gitlab-org/gitlab@master
2023-06-06 00:08:24 +00:00
68caf5fd88
Add latest changes from gitlab-org/gitlab@master
2023-03-23 18:15:39 +00:00
ebe0e306bb
Add latest changes from gitlab-org/gitlab@master
2023-03-07 12:08:06 +00:00
9bf40d9fdc
Add latest changes from gitlab-org/gitlab@master
2022-09-29 12:08:49 +00:00
4dc41ac252
Add latest changes from gitlab-org/gitlab@master
2022-05-25 15:08:05 +00:00
60028378dd
Add latest changes from gitlab-org/gitlab@master
2022-03-08 09:17:44 +00:00
f9ddf689da
Add latest changes from gitlab-org/gitlab@master
2021-06-04 18:10:08 +00:00
e293789223
Add latest changes from gitlab-org/gitlab@master
2021-03-05 15:09:12 +00:00
835f1214dc
Add latest changes from gitlab-org/gitlab@master
2021-02-14 18:09:20 +00:00
e92c95bf45
Add latest changes from gitlab-org/gitlab@master
2021-02-01 15:08:56 +00:00
b2e2c43b3c
Add latest changes from gitlab-org/gitlab@master
2020-12-24 00:10:25 +00:00
5c9f6c66fa
Add latest changes from gitlab-org/gitlab@master
2020-12-23 12:10:26 +00:00
95ff19a65c
Add latest changes from gitlab-org/gitlab@master
2020-11-27 12:09:14 +00:00
4dfd78cb55
Add latest changes from gitlab-org/gitlab@master
2020-10-29 15:09:12 +00:00
15b3452054
Add latest changes from gitlab-org/gitlab@master
2020-09-28 09:09:35 +00:00
d06c308380
Add latest changes from gitlab-org/gitlab@master
2020-08-20 09:09:55 +00:00
cfe63cce6a
Add latest changes from gitlab-org/gitlab@master
2020-02-17 06:08:55 +00:00
bc89882970
Add latest changes from gitlab-org/gitlab@master
2019-09-24 09:06:04 +00:00
80f61b4035
Add latest changes from gitlab-org/gitlab@master
2019-09-18 14:02:45 +00:00
c559bcca03
Prettify additional modules (I through Z)
2018-10-16 13:01:19 -05:00
0e6441164f
remove all unused eslint-disable rules
2018-06-20 14:28:28 +02:00
cf01719d6e
Resolve ""Click to expand" link in collapsed diffs should be blue"
2018-06-14 20:22:56 +00:00
f248be7257
require jQuery to be explicitly imported
2018-03-09 15:18:09 -06:00
35c8fd5586
Update to jQuery 3.
2018-02-20 22:20:48 +00:00
6ceb2cb3c0
only show error if there is an error
2018-02-20 17:32:25 +11:00
dfc626059b
Replace $.get in single file diff with axios
2018-01-30 12:19:50 +00:00
aa90e8ea5b
Export old code into es6 modules
2017-12-13 09:26:44 +00:00
b54203f0ad
Commenting on image diffs
2017-10-07 04:25:17 +00:00
5c52ca9a0c
refactor SingleFileDiff class to ES module syntax
2017-07-06 13:39:28 -05:00
dfe7b14347
refactor single_file_diff.js to use ES class syntax
2017-07-06 10:10:00 -05:00
c06dad62e1
Remove IIFEs around several javascript classes
2017-07-05 17:20:41 +00:00
81e9c28425
Render add-diff-note button with server.
...
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
2017-06-29 12:50:45 -04:00
7e09a9b7dc
Clean up diff rendering
2017-05-23 15:37:05 -05:00
e4e95adf48
remove bind polyfill from single_file_diff.js
2017-05-08 17:40:20 -05:00
0f31c5a92b
replace implicit this == window with explicit binding
2017-02-17 16:58:32 -06:00
b57027f2a5
Use a new class to keep old behavior
2017-02-08 20:52:08 -06:00
04eff5fdb0
resolve all x-spacing and no-spaced-x eslint violations
2017-01-18 17:18:40 -06:00
ccada28f30
resolve all padded-blocks eslint violations
2017-01-18 17:16:41 -06:00
c1dd08e17b
fixed commit diff linking and added specs
2017-01-14 14:25:37 +00:00
8e0e902b13
resolve all instances of no-undef eslint rule violations
2016-12-14 02:11:13 -06:00
c434568f37
re-apply MR !6285 "Added forceLoad ability to singleFileDiffs, added callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found"
...
Use url utility to retrieve hash
2016-12-02 17:38:58 -06:00
2de245c7ba
temporarily revert "Added forceLoad ability to singleFileDiffs, added callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found"
...
This reverts commit d2ee380816
2016-12-02 17:32:37 -06:00
7cefaea876
explicitly disable eslint inline
2016-11-15 16:30:34 +00:00
c8133c53b2
Changed how resolving notes is rendered
...
Vue2 was taking the template out & then appending again. This changes that
2016-11-10 17:53:34 +03:00
3981f9f968
Merge branch '21633-permalink-to-collapsed-diff-line-does-not-work' into '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
2016-11-01 20:31:04 +00:00
02f94cf038
disable ESLint for all JavaScript files
2016-10-26 10:02:58 +02:00
d2ee380816
Added forceLoad ability to singleFileDiffs, added callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found
...
Use url utility to retrieve hash
2016-10-21 22:28:16 +01:00
ffdccaa0a8
Updated diff toggle targets and added icon
2016-09-03 20:24:31 +01:00
GitLab Bot
Mike Greiling
Lukas Eipert
Annabel Gray
Jacob Schatz
Simon Knox
Clement Ho
Filipa Lacerda
Felipe Artur
Mike Greiling
Bryce Johnson
Douwe Maan
Luke "Jared" Bennett
Luke Bennett
Phil Hughes
Fatih Acet
winniehell