summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* 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-0234-3458/+171
| |\
| * | 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-2826-186/+209
| |\ \
| * | | Add period to multi-sentence rebase locally messageEric Eastwood2017-09-281-1/+1
| * | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-26120-1409/+4831
| |\ \ \
| * | | | 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-2851-835/+777
| |\ \ \ \ \ \
| * | | | | | | 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
* | | | | | | | Merge branch 'fork-btn-enabled-user-groups' into 'master'Filipa Lacerda2017-09-294-16/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix fork button being disabled for users who can fork to groupPhil Hughes2017-09-294-16/+20
* | | | | | | | | 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-2910-3341/+43
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | FIxed the clearing icon + jumping of fluid nav baricons-update-nav-barsTim Zallmann2017-09-292-1/+2
| * | | | | | | | | Fixed CSS Lint ErrorTim Zallmann2017-09-281-1/+1
| * | | | | | | | | Updated All Navigation Icons to Sprite_IconsTim Zallmann2017-09-289-3340/+41
* | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fixes data parameter not being sent in ajax request for jobs log38528-build-urlFilipa Lacerda2017-09-281-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'acet-repo-editor-prevent-extra-request' into 'master'Jacob Schatz2017-09-282-7/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | RepoEditor: Prevent extra network call for already opened files.acet-repo-editor-prevent-extra-requestFatih Acet2017-09-272-7/+18
* | | | | | | | | Merge branch 'jramsay-spelling-occurred' into 'master'Jacob Schatz2017-09-2814-17/+17
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix spelling of occurredjramsay-spelling-occurredJames Ramsay2017-09-2614-17/+17
* | | | | | | | | Merge branch 'mobile-images-lazy-load-check' into 'master'Tim Zallmann2017-09-282-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | karma spec fixesmobile-images-lazy-load-checkPhil Hughes2017-09-271-1/+1
| * | | | | | | | | Lazy load images in mobile sidebar & headerPhil Hughes2017-09-272-1/+6
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'commit-side-by-side-comment' into 'master'Filipa Lacerda2017-09-281-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fixes commit comments in side-by-side diff viewcommit-side-by-side-commentPhil Hughes2017-09-271-3/+3
* | | | | | | | | Merge branch 'rotated_profile_image' into 'master'Tim Zallmann2017-09-281-1/+2
|\ \ \ \ \ \ \ \ \