Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-30Merge branch 'fix-sidebar-showing-mobile-merge-requests' into 'master'Tim Zallmann
Fixed sidebar not collapsing on merge request in mobile screens Closes #32759 See merge request !12489
2017-06-29Refactored tests and added a breakpoint to the merge_request_tabsJose Ivan Vargas
2017-06-29Split up MergeRequestsControllerDouwe Maan
2017-06-27Fixed sidebar not collapsing on merge request in mobile screensJose Ivan Vargas
2017-06-23Fix offset for fixed navAnnabel Dunstone Gray
2017-06-21Fix linking to line number on parallel diff creating empty discussionEric Eastwood
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34010
2017-06-21Remove vue from main.bundle.js file being loaded through ↵Filipa Lacerda
`app/assets/javascripts/merge_request_tabs.js`
2017-06-20Uniformize code between both pipelines tablesFilipa Lacerda
2017-05-26Fix error thrown with missing note fragment in DOMEric Eastwood
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
2017-05-18Fix linking to unresolved/expanded diff noteEric Eastwood
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32424 Bug introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11327
2017-05-16Merge branch '32125-fix-link-to-note-in-diff' into 'master' Fatih Acet
Fix linking to resolved note in diff Closes #32125 See merge request !11327
2017-05-13Fix linking to resolved note in diffEric Eastwood
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32125
2017-05-12Add fixed positioning to top level navbarAnnabel Dunstone Gray
2017-05-11Use position sticky on merge request tabsPhil Hughes
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
2017-04-25Update MR diff blob_fork_suggestion after jQuery updateEric Eastwood
`.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
2017-04-24Fix diffs with edit-forking needsEric Eastwood
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31276
2017-04-07Remove Vue from main bundle and disable production warningsMike Greiling
2017-04-07Fixed duplicate jQuery AJAX spyonPhil Hughes
2017-04-07Fixes failing specAlfredo Sumaran
2017-04-07Destroys pipeline table component when we change tabs in order to stop pollingFilipa Lacerda
2017-03-28Reset container width when switching to pipelines MR tabEric Eastwood
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29539
2017-03-23Remove forced scroll into view when switching to "Changes" MR tabEric Eastwood
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29897
2017-03-22remove Cookies class from global spaceMike Greiling
2017-03-05Remove .es6 from file extensions (!9241)winniehell
2016-12-03refactor MergeRequestTabs to es6 class syntaxMike Greiling
2016-12-03fix diff line highlighting by moving method from the MergeRequestTabs class ↵Mike Greiling
to the Diff class.
2016-12-03temporarily revert "Added forceLoad ability to singleFileDiffs, added ↵Mike Greiling
callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found" This reverts commit d2ee380816fa161d94da54c1f7e594c9a2ba2241.
2016-12-02Clean up common_utils.js (!7318)winniehell
2016-11-17Merge branch '24010-Add-named-anchors-for-diffs-in-the-commit-page' into ↵Sean McGivern
'master' Adds hash anchors to diff_files to make possible linking exact file in commit Closes #24010 See merge request !7298
2016-11-15Fix double event and xhr request call on MR page !7298Yar
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.
2016-11-15explicitly disable eslint inlineLuke "Jared" Bennett
2016-11-11Merge branch 'vue2' into 'master' Fatih Acet
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
2016-11-10Changed how resolving notes is renderedPhil Hughes
Vue2 was taking the template out & then appending again. This changes that
2016-11-10Account for merge request fixed affix barLuke Bennett
account for merge request fixed affix bar when adjusting scroll targets
2016-11-01Merge branch '21633-permalink-to-collapsed-diff-line-does-not-work' into ↵Fatih Acet
'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-10-26disable ESLint for all JavaScript fileswinniehell
2016-10-25replace jquery.cookie vendor script with js.cookieMike Greiling
2016-10-24invoked the pipelines class when builds are dynamically loaded and ↵Luke Bennett
dispatched for commit builds page
2016-10-22Added forceLoad ability to singleFileDiffs, added callback to ↵Luke Bennett
getContentHTML, added conditional force load if a collapsed diff line anchor is found Use url utility to retrieve hash
2016-10-20Fixed issue when images are loading it would push off the tabsPhil Hughes
2016-10-20Fixed issues with sticky mr tabs & sidebarPhil Hughes
Closes #23504
2016-10-14Merge branch 'mr-tabs-affix' into 'master' Fatih Acet
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) ![sticky](/uploads/372a9889c50e9f85fef475cbee110ec1/sticky.gif) ## What are the relevant issue numbers? Closes #20548 See merge request !6382
2016-10-06MergeRequest new form load diff asynchronouslyPaco Guzman
2016-10-06Fixed testsPhil Hughes
2016-10-06Merge request tabs stick when scrolling pagePhil Hughes
Closes #20548
2016-09-20ensure the 'fixed layout' preference is honored whenever possibleMike Greiling
see #22343 for issue description
2016-09-13Fix line diff side-by-side line highlightingPhil Hughes
2016-09-08Require comments must be included before codeJared Deckard
2016-09-08Restore comments lost when converting CoffeeScript to JavaScriptJared Deckard
2016-08-18Merge branch 'master' into diff-line-comment-vuejsConnor Shea