summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 34102-online-view-of-artifacts-feEric Eastwood2017-10-0426-122/+233
|\
| * Merge branch '38187-38315-fix-dropdown-open-top-bottom-spacing' into 'master'Annabel Dunstone Gray2017-10-031-0/+1
| |\
| | * Fix bottom spacing for dropdowns that open upwards38187-38315-fix-dropdown-open-top-bottom-spacingEric Eastwood2017-10-031-0/+1
| * | Fix linting errors in sprintfWinnie Hellmann2017-10-031-10/+10
| * | Merge branch 'winh-sprintf' into 'master'Tim Zallmann2017-10-033-0/+31
| |\ \
| | * | Add basic sprintf implementation to JavaScriptwinh-sprintfWinnie Hellmann2017-10-033-0/+31
| * | | Merge branch 'mr-widget-merged-date-tooltip' into 'master'Filipa Lacerda2017-10-033-11/+25
| |\ \ \
| | * | | fixed specs when merged event was emptymr-widget-merged-date-tooltipPhil Hughes2017-09-291-4/+10
| | * | | Fixes merge request widget date tooltip inconsistenciesPhil Hughes2017-09-293-10/+18
| * | | | Merge branch 'dm-copy-parallel-diff' into 'master'Phil Hughes2017-10-032-27/+49
| |\ \ \ \
| | * | | | Only copy old/new code when selecting left/right side of parallel diffdm-copy-parallel-diffDouwe Maan2017-10-022-27/+49
| * | | | | Merge branch 'ff_port_from_ee' into 'master'Sean McGivern2017-10-034-21/+39
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_eeValery Sizov2017-10-0224-116/+119
| | |\ \ \ \ \
| | * | | | | | Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-292-1/+2
| | * | | | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-2823-179/+200
| | |\ \ \ \ \ \
| | * | | | | | | Add period to multi-sentence rebase locally messageEric Eastwood2017-09-281-1/+1
| | * | | | | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-2680-1151/+1294
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Use js- classes instead of Vue refs in tests for some perfEric Eastwood2017-09-263-16/+11
| | * | | | | | | Port fast-forward MR widget states from EEEric Eastwood2017-09-194-19/+41
| * | | | | | | | Merge branch '38619-fix-comment-delete-confirm-text' into 'master'Filipa Lacerda2017-10-021-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix comment deletion confirmation dialog typoMark Fletcher2017-10-021-1/+1
| * | | | | | | | | Merge branch 'translation-timeago-a-while-ago' into 'master'Douwe Maan2017-10-021-2/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | Fix translation for 'in a while'translation-timeago-a-while-agoKim "BKC" Carlbäcker2017-09-221-2/+2
| * | | | | | | | | Remove global componentsFilipa Lacerda2017-10-027-35/+55
| * | | | | | | | | Merge branch '34366-issue-sidebar-don-t-render-participants-in-collapsed-stat...Tim Zallmann2017-10-022-22/+27
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 34366-issue-sidebar-don-t-r...Luke "Jared" Bennett2017-09-2828-596/+591
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | * | | | | | | | | Only trigger loadCheck on open toggle, not close. Update specs and add right_...Luke "Jared" Bennett2017-09-282-22/+25
| | * | | | | | | | | Conditionally call loadCheck if lazyLoader is presentLuke "Jared" Bennett2017-09-282-3/+2
| | * | | | | | | | | Trigger load of lazy images when opening sidebar, or clicking 'more participa...Luke "Jared" Bennett2017-09-282-2/+7
| * | | | | | | | | | Merge branch '38052-use-simple-api-for-projects' into 'master'Tim Zallmann2017-10-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Use `simple=true` for projects API for better performancekushalpandya2017-09-291-1/+1
| * | | | | | | | | | Fix incorrectly aligned last updated timeJames Ramsay2017-09-292-2/+2
* | | | | | | | | | | Add test for external HTML artifactEric Eastwood2017-10-031-1/+1
* | | | | | | | | | | Add external link FE for online artifactsEric Eastwood2017-09-292-3/+41
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'fork-btn-enabled-user-groups' into 'master'Filipa Lacerda2017-09-293-15/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix fork button being disabled for users who can fork to groupPhil Hughes2017-09-293-15/+10
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch '38582-popover-badge' into 'master'Phil Hughes2017-09-291-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improves UX of autodevops popover to match gpg oneFilipa Lacerda2017-09-291-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'hash-mr-scroll-load' into 'master'Filipa Lacerda2017-09-291-16/+11
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fixed anchored content not being scrolled into viewPhil Hughes2017-09-291-16/+11
* | | | | | | | | | Merge branch 'icons-update-nav-bars' into 'master'Phil Hughes2017-09-291-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | FIxed the clearing icon + jumping of fluid nav baricons-update-nav-barsTim Zallmann2017-09-291-0/+1
* | | | | | | | | | | Merge branch 'dm-json-page-title' into 'master'Jacob Schatz2017-09-292-5/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Not the Test will also work with other tests beforeTim Zallmann2017-09-291-1/+1
| * | | | | | | | | | Added Test for PageTitle / Removed Gitlab Part from TItleTim Zallmann2017-09-291-1/+1
| * | | | | | | | | | Added Page Title setting for files + directoriesTim Zallmann2017-09-262-4/+6
* | | | | | | | | | | Merge branch 'remove-target-dd' into 'master'Filipa Lacerda2017-09-294-17/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix static analysis.remove-target-ddJacob Schatz2017-09-281-1/+0
| * | | | | | | | | | Removes the target branch and only uses the source branch.Jacob Schatz2017-09-284-16/+2
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '38528-build-url' into 'master'Phil Hughes2017-09-291-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |