summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '31271-fixmr-target-branch-selector-dropdown' into 'master' Jacob Schatz2017-05-043-0/+44
|\
| * Fix MR target branch selector dropdown placement cut-off31271-fixmr-target-branch-selector-dropdownEric Eastwood2017-05-013-0/+44
* | Merge branch 'deploy-keys-load-async' into 'master' Filipa Lacerda2017-05-048-0/+355
|\ \
| * | Fixed Karma specdeploy-keys-load-asyncPhil Hughes2017-05-041-1/+1
| * | Updated webpack configPhil Hughes2017-05-041-5/+1
| * | Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-0424-351/+778
| |\ \
| * \ \ Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-0345-120/+664
| |\ \ \
| * | | | Component specsPhil Hughes2017-05-022-6/+1
| * | | | Started specs [ci skip]Phil Hughes2017-05-021-1/+1
| * | | | Fixed some spinach & rspec testsPhil Hughes2017-04-281-1/+1
| * | | | Updated some Vue specific JSPhil Hughes2017-04-285-12/+9
| * | | | Fixed public keys always rendering even when emptyPhil Hughes2017-04-281-0/+1
| * | | | Re-wrote to match our docs - still not 100% sure but closer than it wasPhil Hughes2017-04-2810-99/+366
| * | | | Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-04-2810-12/+168
| |\ \ \ \
| * | | | | Add timeagoJacob Schatz2017-04-271-2/+6
| * | | | | Add Vue with async deploy keysJacob Schatz2017-04-272-0/+95
* | | | | | Merge branch 'backport-ee-1800-add-enable-map-to-gfm-auto-complete' into 'mas...27070-rename-gitlab-slash-commands-to-quick-actionsPhil Hughes2017-05-041-67/+102
|\ \ \ \ \ \
| * | | | | | Add enableMap to gl.GfmAutoComplete for partial re-usebackport-ee-1800-add-enable-map-to-gfm-auto-completeEric Eastwood2017-05-031-67/+102
* | | | | | | Merge branch 'dm-artifact-blob-viewer' into 'master' Sean McGivern2017-05-041-0/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewerDouwe Maan2017-05-041-0/+3
* | | | | | | Pipeline table mini graph dropdown remains open when table is refreshedFilipa Lacerda2017-05-047-149/+235
* | | | | | | Merge branch '31156-environments-vue-service' into 'master' Phil Hughes2017-05-047-75/+28
|\ \ \ \ \ \ \
| * | | | | | | Adds off for event hubFilipa Lacerda2017-05-041-0/+1
| * | | | | | | Merge branch 'master' into 31156-environments-vue-service31156-environments-vue-serviceFilipa Lacerda2017-05-034-23/+117
| |\ \ \ \ \ \ \
| * | | | | | | | Remove service being provided as a prop on environments tableFilipa Lacerda2017-05-032-11/+6
| * | | | | | | | Remove service from actions dropdown, stop button and redeploy buttonFilipa Lacerda2017-05-036-71/+28
* | | | | | | | | Merge branch '12910-uploader-pers-snippet' into 'master' Sean McGivern2017-05-041-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Support uploaders for personal snippets comments12910-uploader-pers-snippetJarka Kadlecova2017-05-021-5/+5
* | | | | | | | | | Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-043-43/+307
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'dm-link-discussion-to-outdated-diff' into 'master' Sean McGivern2017-05-032-7/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow commenting on older versions of the diff and comparisons between diff v...dm-link-discussion-to-outdated-diffDouwe Maan2017-05-032-7/+0
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Add real-time note edits :chipmunk:Eric Eastwood2017-05-033-72/+151
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge branch '26883-members-page-layout-looks-broken' into 'master' Annabel Dunstone Gray2017-05-031-0/+52
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Added flex wrapping26883-members-page-layout-looks-brokenJose Ivan Vargas2017-04-242-7/+52
| * | | | | | | Added a media query when there's a more width available to show more of the t...Jose Ivan Vargas2017-04-241-0/+3
| * | | | | | | Changed the way to truncate the panel to title from ruby to a scss mixinJose Ivan Vargas2017-04-241-0/+4
* | | | | | | | Merge branch 'async-milestone-tabs' into 'master' Jacob Schatz2017-05-031-19/+57
|\ \ \ \ \ \ \ \
| * | | | | | | | Moved sort endpoints into data attributesasync-milestone-tabsPhil Hughes2017-04-281-10/+17
| * | | | | | | | Fixed tabs loading the ajax request twicePhil Hughes2017-04-261-2/+2
| * | | | | | | | Change the hash when changing tabPhil Hughes2017-04-261-17/+37
| * | | | | | | | Load milestone tabs asynchronouslyPhil Hughes2017-04-261-9/+20
* | | | | | | | | Merge branch 'commit-limited-container-width' into 'master'Robert Speicher2017-05-031-3/+8
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into commit-limited-container-widthPhil Hughes2017-05-0220-0/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into commit-limited-container-widthPhil Hughes2017-05-0260-430/+1434
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Commit view correctly spans the full width when parallel viewPhil Hughes2017-04-241-3/+8
* | | | | | | | | | | | Merge branch '31704-misaligned-buttons-in-wiki-pages' into 'master' Filipa Lacerda2017-05-031-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix misaligned buttons in wiki pages31704-misaligned-buttons-in-wiki-pagesAchilleas Pipinellis2017-05-021-1/+0
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'emoji-button-titles' into 'master' Filipa Lacerda2017-05-031-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Double quotes around gl emoji titleemoji-button-titlesPhil Hughes2017-05-031-1/+1
| * | | | | | | | | | | Merge branch 'master' into emoji-button-titlesPhil Hughes2017-04-2710-237/+253
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |