| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34010
|
| |
|
|
| |
`app/assets/javascripts/merge_request_tabs.js`
|
| | |
|
| |
|
|
|
|
|
|
|
| |
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32888
Reproduction:
1. Visit /namespace/project/merge_requests/x/diffs#note_1234
1. When `#note_1234` isn't in the diff, an error is thrown
|
| |
|
|
|
|
|
| |
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32424
Bug introduced in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11327
|
| |\
| |
| |
| |
| |
| |
| | |
Fix linking to resolved note in diff
Closes #32125
See merge request !11327
|
| | |
| |
| |
| | |
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32125
|
| | | |
|
| |/
|
|
| |
Removes the need for Bootstraps affix on browser that support sticky positions. On these browsers, there should be a slight performance improvement as there will be no scrolling events, it will all be handled by the browser
|
| |
|
|
|
|
|
|
|
| |
`.init()` was added in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10858
We need to add it the MR diff instance that was added in a separate MR
and of course didn't add a conflict because it is a completely different
piece
|
| |
|
|
| |
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31276
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29539
|
| |
|
|
| |
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29897
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
to the Diff class.
|
| |
|
|
|
|
| |
callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found"
This reverts commit d2ee380816fa161d94da54c1f7e594c9a2ba2241.
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
'master'
Adds hash anchors to diff_files to make possible linking exact file in commit
Closes #24010
See merge request !7298
|
| | |
| |
| |
| |
| | |
On page merge_requests/n/diffs and merge_requests/n/commits 'shown.bs.tab' event triggers twice when tab is loading which lead to extra ajax request for data each time.
This commit prevent this event from triggering twice when tab is loading.
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Migration to Vuejs version 2
List of required changes for our Vue usages
- `init` :arrow_right: `beforeCreate`
- `read` :arrow_right: `mounted`
- `$els` :arrow_right: `$refs`
- :no_entry_sign: `$remove` completely removed. :white_check_mark: Use `indexOf` and `splice`
- :no_entry_sign: HTML embedding with `{{{ }}}` is deprecated. :white_check_mark: Use `v-html`
See merge request !7254
|
| | |/
| |
| |
| | |
Vue2 was taking the template out & then appending again. This changes that
|
| |/
|
|
| |
account for merge request fixed affix bar when adjusting scroll targets
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
'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
|
| | |
| |
| |
| |
| |
| | |
getContentHTML, added conditional force load if a collapsed diff line anchor is found
Use url utility to retrieve hash
|
| | | |
|
| | | |
|
| | |
| |
| |
| | |
dispatched for commit builds page
|
| | | |
|
| |/
|
|
| |
Closes #23504
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Merge request tabs stick when scrolling page
## What does this MR do?
When scrolling merge requests this sticks the tabs to below the navigation for easy access.
## Screenshots (if relevant)
## What are the relevant issue numbers?
Closes #20548
See merge request !6382
|
| | | |
|
| | |
| |
| |
| | |
Closes #20548
|
| |/ |
|
| |
|
|
| |
see #22343 for issue description
|
| | |
|
| | |
|
| | |
|
| |\ |
|
| | | |
|
| |\ \
| |/ |
|
