summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Backport spec changes from EE remove approvals in empty statece-backport-39009-fix-approvals-showing-up-in-empty-mr-widgetEric Eastwood2017-11-131-1/+1
* fix to allow integer label refernceshaseeb2017-11-131-1/+2
* Merge branch 'multi-editor-store-specs' into 'master'Filipa Lacerda2017-11-132-6/+6
|\
| * added missing specsmulti-editor-store-specsPhil Hughes2017-11-101-1/+1
| * test updatesPhil Hughes2017-11-101-1/+1
| * Added tests to multi-file Vuex storePhil Hughes2017-11-101-4/+4
* | Export text utils as ES6 modulesFilipa Lacerda2017-11-1317-206/+227
* | Merge branch '39564-clear-filter-on-gitlab-dropdown-open' into 'master'Tim Zallmann2017-11-121-1/+1
|\ \ | |/ |/|
| * Change fix, instead of hacking in a filter clear every time, fix the root cau...39564-clear-filter-on-gitlab-dropdown-openLuke "Jared" Bennett2017-11-071-3/+1
| * Run filter method for filterable gl_dropdown instancesLuke "Jared" Bennett2017-11-061-0/+2
* | Merge branch 'disable-issue-action-button-if-isSubmitting' into 'master'Fatih Acet2017-11-091-1/+2
|\ \
| * | Disable issue action button whilst submitting and testdisable-issue-action-button-if-isSubmittingLuke "Jared" Bennett2017-11-061-1/+2
| |/
* | Enables scroll to bottom once user has scrolled back to bottom in job logFilipa Lacerda2017-11-091-26/+24
* | Resolve "Merge request widget - CI information has different margins"Filipa Lacerda2017-11-084-92/+109
* | Merge remote-tracking branch 'origin/master' into add-ingress-to-cluster-appl...Kamil Trzcinski2017-11-073-3/+6
|\ \
| * \ Merge branch '38464-k8s-apps' into 'master'Kamil TrzciƄski2017-11-0710-126/+631
| |\ \
| * \ \ Merge branch 'multi-file-editor-table-cells-width' into 'master'Filipa Lacerda2017-11-073-3/+6
| |\ \ \
| | * | | Fixed multi-file editor table cells content width jumpingmulti-file-editor-table-cells-widthPhil Hughes2017-11-073-3/+6
* | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Kamil Trzcinski2017-11-0715-79/+227
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-0815-79/+227
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '38394-smarter-interval' into 'master'Filipa Lacerda2017-11-072-11/+27
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 38394-smarter-i...Simon Knox2017-11-0714-88/+162
| | | |\ \
| | | * | | update changelogSimon Knox2017-11-071-1/+1
| | | * | | fix line lintSimon Knox2017-11-061-1/+2
| | | * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 38394-smarter-i...Simon Knox2017-11-06155-3734/+4760
| | | |\ \ \
| | | * | | | review feedback - throw error in smart_callback catch blockSimon Knox2017-11-021-2/+3
| | | * | | | update docstringSimon Knox2017-10-311-1/+1
| | | * | | | remove global export from SmartIntervalSimon Knox2017-10-312-4/+4
| | | * | | | don't re-run smart interval callback if there is already one in progressSimon Knox2017-10-242-6/+20
| | * | | | | Merge branch 'multi-file-editor-separate-commits-call' into 'master'Filipa Lacerda2017-11-0713-68/+200
| | |\ \ \ \ \
| | | * | | | | fixed karma testmulti-file-editor-separate-commits-callPhil Hughes2017-11-061-1/+1
| | | * | | | | moved key into data structurePhil Hughes2017-11-064-5/+12
| | | * | | | | correctly updates commit data after committing changesPhil Hughes2017-11-069-79/+126
| | | * | | | | only allow the call when not in collapsed viewPhil Hughes2017-11-062-2/+4
| | | * | | | | Multi-file editor fetch log data from a different endpointPhil Hughes2017-11-069-17/+93
| | | | |_|_|/ | | | |/| | |
* | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsKamil Trzcinski2017-11-0714-97/+190
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Shinya Maeda2017-11-072-5/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-0714-97/+190
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge branch '2518-saved-configuration-for-issue-board' into 'master'Sean McGivern2017-11-079-65/+120
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | unused propSimon Knox2017-11-061-7/+1
| | | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 2518-saved-conf...Simon Knox2017-11-0626-229/+231
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | fix bad master mergeSimon Knox2017-11-021-4/+4
| | | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 2518-saved-conf...Simon Knox2017-11-0163-1835/+1989
| | | |\ \ \ \ \
| | | * | | | | | resolve conflictsSimon Knox2017-10-311-42/+17
| | | * | | | | | match UX guide for submit/cancel buttonsSimon Knox2017-10-311-2/+2
| | | * | | | | | apply changes for JS and CSS from gitlab-ee!2912Simon Knox2017-10-3110-52/+138
| | * | | | | | | Merge branch 'multiple-query-prometheus-graphs' into 'master'Tim Zallmann2017-11-075-32/+70
| | |\ \ \ \ \ \ \
| | | * | | | | | | make legend X-offset into a constantmultiple-query-prometheus-graphsMike Greiling2017-11-062-6/+8
| | | * | | | | | | fix eslint max-lineMike Greiling2017-11-061-1/+2
| | | * | | | | | | correctly set the domain of a result set when it is different on other tracksMike Greiling2017-11-062-11/+11