summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Prevent overflow of long instance urls during Project creationLukas Eipert2018-03-221-20/+30
* Fix class nameFilipa Lacerda2018-03-221-1/+1
* Merge branch 'master' into '44453-performance-bar-modalbox'44453-performance-bar-modalboxPhil Hughes2018-03-2214-194/+241
|\
| * Merge branch 'performance-bar-position-fix' into 'master'Filipa Lacerda2018-03-226-48/+58
| |\
| | * removed check for hostPhil Hughes2018-03-214-35/+27
| | * Fix performance bar spacingPhil Hughes2018-03-214-15/+33
| * | Merge branch 'disable-btn-mr-when-posting-comment' into 'master'Fatih Acet2018-03-211-2/+3
| |\ \
| | * | Disables the button when submitting comment.Jacob Schatz2018-03-211-2/+3
| * | | Merge branch 'refactor/move-time-tracking-vue-components' into 'master'Filipa Lacerda2018-03-213-98/+104
| |\ \ \
| | * | | Move TimeTrackingCollapsedState vue componentGeorge Tsiolis2018-03-213-98/+104
| * | | | Merge branch 'ide-folder-button-path' into 'master'Tim Zallmann2018-03-214-45/+75
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fixes the web IDE link in tree list opening the wrong URLPhil Hughes2018-03-214-45/+75
| | |/ /
* | | | Prevent column with smaller width in performance barFilipa Lacerda2018-03-211-2/+1
* | | | Merge branch 'master' into 44453-performance-bar-modalboxFilipa Lacerda2018-03-2174-240/+4515
|\ \ \ \ | |/ / /
| * | | Merge branch '39584-nesting-depth-5-framework-dropdowns' into 'master'Clement Ho2018-03-211-4/+2
| |\ \ \
| | * | | Apply NestingDepth (level 5) (framework/dropdowns.scss)Takuya Noguchi2018-03-211-4/+2
| | | |/ | | |/|
| * | | Merge branch 'ide-project-avatar-identicon' into 'master'Filipa Lacerda2018-03-211-7/+18
| |\ \ \
| | * | | Changes empty project avatar to identicon in the IDEPhil Hughes2018-03-211-7/+18
| | | |/ | | |/|
| * | | Merge branch 'fix-confirm-danger-modal' into 'master'Filipa Lacerda2018-03-214-41/+32
| |\ \ \ | | |/ / | |/| |
| | * | move confirm_danger_modal bindings directly into the only two pages that need itfix-confirm-danger-modalMike Greiling2018-03-204-10/+15
| | * | refactor ConfirmDangerModal into ES moduleMike Greiling2018-03-202-37/+23
| * | | Merge branch 'make-ide-ce' into 'master'Tim Zallmann2018-03-2167-117/+4411
| |\ \ \ | | |_|/ | |/| |
| | * | remove JS for cookie togglePhil Hughes2018-03-201-22/+19
| | * | fixed SCSS lintPhil Hughes2018-03-201-0/+7
| | * | updated file references in specsPhil Hughes2018-03-201-3/+3
| | * | Move IDE to CEPhil Hughes2018-03-2066-95/+4385
| * | | Resolve "Loss of input text on comments after preview"Simon Knox2018-03-202-78/+59
| |/ /
* | | Adds a bigger width to the performance bar modal box and breaks the contentFilipa Lacerda2018-03-203-2/+14
|/ /
* | Merge branch '42558-add-monitoring-no-data-empty-state' into 'master'Phil Hughes2018-03-202-1/+10
|\ \ | |/ |/|
| * add no_data illustration to monitoring empty stateMike Greiling2018-03-192-1/+10
* | move render_gfm into behaviors directoryMike Greiling2018-03-197-11/+11
* | Merge branch 'ajax-requests-in-performance-bar' into 'master'Robert Speicher2018-03-1911-67/+500
|\ \ | |/ |/|
| * Show Ajax requests in performance barSean McGivern2018-03-1911-67/+500
* | Merge branch '44383-cleanup-framework-header' into 'master'Phil Hughes2018-03-191-56/+52
|\ \ | |/ |/|
| * Clean up selectors in framework/header.scssTakuya Noguchi2018-03-201-56/+52
* | Merge branch '44384-cleanup-css-for-nested-lists' into 'master'Filipa Lacerda2018-03-191-6/+0
|\ \
| * | Unify format for nested non-task listsTakuya Noguchi2018-03-181-6/+0
* | | Merge branch 'refactor/move-mr-widget-sha-mismatch-vue-component' into 'master'Clement Ho2018-03-195-22/+29
|\ \ \
| * | | Move ShaMismatch vue componentGeorge Tsiolis2018-03-195-22/+29
| | |/ | |/|
* | | Resolve "Notes karma specs failing"Simon Knox2018-03-191-9/+3
|/ /
* | Make issue boards height calculation clearer and remove magic numbersLukas Eipert2018-03-194-61/+80
* | Merge branch 'refactor/move-mr-widget-unresolved-discussions-vue-component' i...Mike Greiling2018-03-193-28/+34
|\ \
| * | Move UnresolvedDiscussions vue componentGeorge Tsiolis2018-03-083-28/+34
* | | Fix dropzone project showClement Ho2018-03-181-4/+17
| |/ |/|
* | Merge branch 'acet-notes-prettified' into 'master'Mike Greiling2018-03-1626-1792/+2149
|\ \
| * | Prettify notes.Fatih Acet2018-03-1626-1792/+2149
* | | Merge branch 'profile-notifications-dropdown-fix' into 'master'Filipa Lacerda2018-03-161-0/+7
|\ \ \
| * | | Fixed profile notifications not being editableprofile-notifications-dropdown-fixPhil Hughes2018-03-161-0/+7
| |/ /
* | | Merge branch '39521-fix-merge-request-discussion-timestamp-overflow' into 'ma...Fatih Acet2018-03-161-1/+1
|\ \ \ | |/ / |/| |
| * | Fix discussion timestamp overflow in merge request parallel view39521-fix-merge-request-discussion-timestamp-overflowdtang2018-03-061-1/+1
View Lorry Controller Status