summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_request_tabs.js
Commit message (Collapse)AuthorAgeFilesLines
* fixed karma testssticky-perfPhil Hughes2017-10-231-1/+2
|
* calculate the stickyTop instead of hard coding a variablePhil Hughes2017-10-231-1/+9
|
* Remove Diff class from globalnamespaceFilipa Lacerda2017-10-191-2/+2
|
* Flash is now a ES6 modulePhil Hughes2017-10-101-2/+1
| | | | | | | | | | | Reduced the technical debt around our JS flash function by making it a module that is imported rather than relying on the global function. The global function still exists mainly for technical debt with how some requests are being completed, but new JS should import the module directly. Also reduces some tech debt in the file by removing the need for jQuery. Instead Flash is now 100% vanilla JS.
* Commenting on image diffsFelipe Artur2017-10-071-0/+4
|
* Stop breadcrumbs changing container when in side-by-side diffmr-side-by-side-breadcrumbs-containerPhil Hughes2017-09-251-1/+1
| | | | Closes #37641
* Resolve "Better SVG Usage in the Frontend"Tim Zallmann2017-09-221-0/+2
|
* Import modules instead of using the ones in global namespaceFilipa Lacerda2017-09-091-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Removes set favicon related methods from global scope Improves test related with favicon Removes convertPermissionToBoolean from global scope. Adds tests for convertPermissionToBoolean - were non existant Removes setParamInURL from gl.utils Removes parseIntPagination from gl.utils namespace Remove normalizeCRLFHeaders from gl.utils namespace Removes normalizeHeaders from gl.utils namespace Use gl.utils for filtered search Fix bad import Fix broken test by cleaning window.history namespace Adds changelog
* Use modules in common utilsFilipa Lacerda2017-09-091-1/+2
|
* Adds documentation path to pipelines table in merge request pageFilipa Lacerda2017-09-041-0/+1
|
* Fixes the diff changes buttons from toggling when scrollingchanges-bar-sticky-fixPhil Hughes2017-08-291-0/+1
| | | | Closes #36698
* removed global use of breakpoint checkerbreakpoint-checker-performancePhil Hughes2017-08-101-5/+4
|
* Fix the sticky changes bar on commits pagefixed-sticky-stats-box-commit-viewPhil Hughes2017-08-091-11/+2
|
* made the changed files holder stickyPhil Hughes2017-08-031-0/+3
|
* Moved changed files into a dropdownPhil Hughes2017-08-031-0/+9
| | | | | | | | | | | This makes navigating through diff files quickly. Currently we just toggle a list, which could be pretty big. This moves it into a dropdown to make it much easier. Also includes a filter bar to quickly search for certain files/extensions. Closes #29778
* Merge branch 'fix-sidebar-showing-mobile-merge-requests' into 'master'Tim Zallmann2017-06-301-1/+3
|\ | | | | | | | | | | | | Fixed sidebar not collapsing on merge request in mobile screens Closes #32759 See merge request !12489
| * Refactored tests and added a breakpoint to the merge_request_tabsfix-sidebar-showing-mobile-merge-requestsJose Ivan Vargas2017-06-291-0/+3
| |
| * Fixed sidebar not collapsing on merge request in mobile screensJose Ivan Vargas2017-06-271-1/+0
| |
* | Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-281-7/+6
|/
* Fix offset for fixed navAnnabel Dunstone Gray2017-06-231-1/+5
|
* Fix linking to line number on parallel diff creating empty discussion34010-fix-linking-to-parallel-diff-line-number-creating-gray-boxEric Eastwood2017-06-211-1/+1
| | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34010
* Remove vue from main.bundle.js file being loaded through ↵34017-common-vueFilipa Lacerda2017-06-211-3/+1
| | | | `app/assets/javascripts/merge_request_tabs.js`
* Uniformize code between both pipelines tablesFilipa Lacerda2017-06-201-3/+12
|
* Fix error thrown with missing note fragment in DOM32888-fix-error-after-missing-note-hash-fragment-in-domEric Eastwood2017-05-261-1/+1
| | | | | | | | | 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 linking to unresolved/expanded diff note32424-fix-linking-to-unresolved-expanded-diff-noteEric Eastwood2017-05-171-1/+5
| | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32424 Bug introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11327
* Merge branch '32125-fix-link-to-note-in-diff' into 'master' Fatih Acet2017-05-161-1/+17
|\ | | | | | | | | | | | | Fix linking to resolved note in diff Closes #32125 See merge request !11327
| * Fix linking to resolved note in diff32125-fix-link-to-note-in-diffEric Eastwood2017-05-121-1/+17
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32125
* | Add fixed positioning to top level navbarAnnabel Dunstone Gray2017-05-121-1/+2
| |
* | Use position sticky on merge request tabsmr-tabs-sticky-pocPhil Hughes2017-05-111-0/+7
|/ | | | 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
* Update MR diff blob_fork_suggestion after jQuery updateupdate-mr-diff-blob-fork-suggestion-after-jquery-udpateEric Eastwood2017-04-251-1/+2
| | | | | | | | | `.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 diffs with edit-forking needs31276-fix-diffs-with-edit-forking-needsEric Eastwood2017-04-241-0/+11
| | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31276
* Remove Vue from main bundle and disable production warningsMike Greiling2017-04-071-4/+1
|
* Fixed duplicate jQuery AJAX spyonkarma-failure-fixPhil Hughes2017-04-071-3/+3
|
* Fixes failing spec5983-realtime-pipelines-tableAlfredo Sumaran2017-04-061-0/+2
|
* Destroys pipeline table component when we change tabs in order to stop pollingFilipa Lacerda2017-04-061-13/+13
|
* Reset container width when switching to pipelines MR tabEric Eastwood2017-03-281-8/+25
| | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29539
* Remove forced scroll into view when switching to "Changes" MR tabEric Eastwood2017-03-231-3/+0
| | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29897
* remove Cookies class from global spaceMike Greiling2017-03-221-2/+2
|
* Remove .es6 from file extensions (!9241)winniehell2017-03-051-0/+358
|
* refactor MergeRequestTabs to es6 class syntaxMike Greiling2016-12-021-405/+0
|
* fix diff line highlighting by moving method from the MergeRequestTabs class ↵Mike Greiling2016-12-021-35/+11
| | | | to the Diff class.
* temporarily revert "Added forceLoad ability to singleFileDiffs, added ↵Mike Greiling2016-12-021-16/+2
| | | | | | callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found" This reverts commit d2ee380816fa161d94da54c1f7e594c9a2ba2241.
* Clean up common_utils.js (!7318)winniehell2016-12-011-1/+2
|
* Merge branch '24010-Add-named-anchors-for-diffs-in-the-commit-page' into ↵Sean McGivern2016-11-171-1/+2
|\ | | | | | | | | | | | | | | | | | | 'master' Adds hash anchors to diff_files to make possible linking exact file in commit Closes #24010 See merge request !7298
| * Fix double event and xhr request call on MR page !7298Yar2016-11-151-1/+2
| | | | | | | | | | 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.
* | explicitly disable eslint inlineexplicitly-disable-eslint-inlineLuke "Jared" Bennett2016-11-151-1/+1
| |
* | Merge branch 'vue2' into 'master' Fatih Acet2016-11-111-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Changed how resolving notes is renderedPhil Hughes2016-11-101-2/+2
| |/ | | | | | | Vue2 was taking the template out & then appending again. This changes that
* | Account for merge request fixed affix bar23520-mr-sticky-tabs-overlap-discussion-from-anchorLuke Bennett2016-11-101-1/+1
|/ | | | account for merge request fixed affix bar when adjusting scroll targets
* Merge branch '21633-permalink-to-collapsed-diff-line-does-not-work' into ↵Fatih Acet2016-11-011-2/+16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
View Lorry Controller Status