summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Fixes merge request bar styling when performance bar is visiblemr-sticky-tabs-perf-barPhil Hughes2018-03-151-0/+5
* | | Merge branch 'jivl-realtime-update-adding-file' into 'master'Phil Hughes2018-03-151-0/+22
|\ \ \
| * | | Add realtime pipeline status component for filesJose Ivan Vargas2018-03-141-0/+22
* | | | Change path of CI lints create index.js filePhil Hughes2018-03-141-0/+0
* | | | Merge branch 'mr-widget-deployment-styling' into 'master'Filipa Lacerda2018-03-145-123/+187
|\ \ \ \
| * | | | removed useless v-ifPhil Hughes2018-03-143-12/+3
| * | | | improved markupPhil Hughes2018-03-131-24/+20
| * | | | fixed breakpointPhil Hughes2018-03-132-46/+62
| * | | | fixed scss-lintPhil Hughes2018-03-131-4/+2
| * | | | fixed eslintPhil Hughes2018-03-131-10/+1
| * | | | adjust styling to remove gapsPhil Hughes2018-03-131-1/+21
| * | | | updated specsPhil Hughes2018-03-131-14/+24
| * | | | Fix styling of multiple environments in merge request widgetPhil Hughes2018-03-135-120/+162
| |/ / /
* | | | Merge branch 'fix-emoji-popup' into 'master'Sean McGivern2018-03-141-2/+1
|\ \ \ \
| * | | | Hide emoji popup after multiple spaces or blank linesJan Beckmann2018-03-111-2/+1
* | | | | Merge branch '44024-fix-table-extra-column' into 'master'Clement Ho2018-03-132-2/+5
|\ \ \ \ \
| * | | | | Fix markdown table showing an extra rake column44024-fix-table-extra-columnEric Eastwood2018-03-092-2/+5
* | | | | | Merge branch 'jivl-fix-timescale-prometheus-charts-overlapping' into 'master'Mike Greiling2018-03-131-0/+1
|\ \ \ \ \ \
| * | | | | | Use graph width to determine tick numberjivl-fix-timescale-prometheus-charts-overlappingJose Ivan Vargas2018-03-122-27/+3
| * | | | | | fix timescale prometheus charts overlappingJose Ivan Vargas2018-03-082-2/+27
* | | | | | | Merge branch '43805-list-gitaly-calls-and-arguments-in-the-performance-bar' i...Grzegorz Bizon2018-03-131-7/+0
|\ \ \ \ \ \ \
| * | | | | | | Improve the frontend code for the performance barSean McGivern2018-03-131-14/+0
| * | | | | | | Add Gitaly call details to the performance barSean McGivern2018-03-131-0/+7
* | | | | | | | Merge branch '44152l-last-pipeline-link' into 'master'Phil Hughes2018-03-131-4/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Make commit pipeline accessible on file pageFilipa Lacerda2018-03-131-4/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Resolve "Projects::MergeRequestsController#show is slow (implement skeleton l...Simon Knox2018-03-131-0/+68
* | | | | | | Use mapState instead of a getterFilipa Lacerda2018-03-132-2/+3
* | | | | | | Merge branch 'master' into 44149-issue-comment-buttonsFilipa Lacerda2018-03-1311-73/+97
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'refactor/move-mr-widget-nothing-to-merge-vue-component' into 'm...Clement Ho2018-03-123-45/+48
| |\ \ \ \ \ \
| | * | | | | | Move NothingToMerge vue componentGeorge Tsiolis2018-03-083-45/+48
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'removes-source-branch-widget-state' into 'master'Filipa Lacerda2018-03-123-1/+7
| |\ \ \ \ \ \
| | * | | | | | Fix removes source branch text being rendered in merged stateremoves-source-branch-widget-statePhil Hughes2018-03-123-1/+7
| * | | | | | | Merge branch 'fix-duplicate-notes' into 'master'Filipa Lacerda2018-03-123-13/+14
| |\ \ \ \ \ \ \
| | * | | | | | | fixed note polling not sending updated last fetched at datefix-duplicate-notesPhil Hughes2018-03-122-6/+5
| | * | | | | | | added mutation specPhil Hughes2018-03-101-6/+8
| | * | | | | | | fix polling not working correctlyPhil Hughes2018-03-091-1/+1
| | * | | | | | | Fixed issue notes being duplicatedPhil Hughes2018-03-092-3/+3
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Resolve "Hover style for sidebar dropdowns is wrong"Lukas Eipert2018-03-121-13/+27
| * | | | | | | Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'Phil Hughes2018-03-121-1/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |