summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'backport-4006-add-weight-indicator-to-issues-board' into 'master'Clement Ho2018-03-221-2/+2
|\
| * backport dependency import change in issue_card_inner.jsbackport-4006-add-weight-indicator-to-issues-boardDennis Tang2018-03-211-2/+2
* | Fix class nameFilipa Lacerda2018-03-221-1/+1
* | Merge branch 'master' into '44453-performance-bar-modalbox'44453-performance-bar-modalboxPhil Hughes2018-03-2213-188/+241
|\ \
| * \ Merge branch 'performance-bar-position-fix' into 'master'Filipa Lacerda2018-03-225-42/+58
| |\ \
| | * | removed check for hostPhil Hughes2018-03-213-29/+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
| | |/ /
* | | | Merge branch 'master' into 44453-performance-bar-modalboxFilipa Lacerda2018-03-2171-141/+4202
|\ \ \ \ | |/ / /
| * | | 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-2165-22/+4100
| |\ \ \ | | |_|/ | |/| |
| | * | remove JS for cookie togglePhil Hughes2018-03-201-22/+19
| | * | updated file references in specsPhil Hughes2018-03-201-3/+3
| | * | Move IDE to CEPhil Hughes2018-03-2064-0/+4081
| * | | 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-201-0/+1
|/ /
* | 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
* | Show Ajax requests in performance barSean McGivern2018-03-1910-61/+477
|/
* 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
|/
* 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
* | | Fixed profile notifications not being editableprofile-notifications-dropdown-fixPhil Hughes2018-03-161-0/+7
|/ /
* | 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-144-123/+152
|\ \ \
| * | | removed useless v-ifPhil Hughes2018-03-142-8/+3
| * | | improved markupPhil Hughes2018-03-131-24/+20
| * | | fixed breakpointPhil Hughes2018-03-131-44/+59
| * | | fixed eslintPhil Hughes2018-03-131-10/+1
| * | | updated specsPhil Hughes2018-03-131-14/+24
| * | | Fix styling of multiple environments in merge request widgetPhil Hughes2018-03-134-120/+142
| |/ /
* | | Merge branch 'fix-emoji-popup' into 'master'Sean McGivern2018-03-141-2/+1
|\ \ \