summaryrefslogtreecommitdiff
path: root/spec/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'backport-3434' into 'master'Filipa Lacerda2017-11-231-0/+37
* Merge branch '39167-async-boards-sidebar' into 'master'Sean McGivern2017-11-233-14/+29
* Merge branch 'backport-delete-epic' into 'master'Filipa Lacerda2017-11-173-14/+63
* Merge branch '40092-fix-cluster-size' into 'master'Tim Zallmann2017-11-151-1/+26
* Merge branch 'remove-ineffective-service-specs' into 'master'Filipa Lacerda2017-11-092-113/+0
* Merge branch '38395-mr-widget-ci' into 'master'Phil Hughes2017-11-091-82/+89
* Merge branch 'fl-cleanup-test' into 'master'Tim Zallmann2017-11-081-23/+0
|\
| * Update mr_widget_options_spec.jsfl-cleanup-testFilipa Lacerda2017-11-071-1/+0
| * Cleanup testsFilipa Lacerda2017-11-071-22/+0
* | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Kamil Trzcinski2017-11-074-125/+190
|\ \ | |/
| * Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-084-125/+190
| |\
| | * Merge branch '38394-smarter-interval' into 'master'Filipa Lacerda2017-11-072-122/+139
| | |\
| | | * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 38394-smarter-i...Simon Knox2017-11-0714-91/+152
| | | |\
| | | * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 38394-smarter-i...Simon Knox2017-11-0685-1510/+3613
| | | |\ \
| | | * | | review feedback - throw error in smart_callback catch blockSimon Knox2017-11-021-6/+9
| | | * | | remove global export from SmartIntervalSimon Knox2017-10-312-132/+134
| | | * | | add changelog and specSimon Knox2017-10-271-0/+12
| | | * | | don't re-run smart interval callback if there is already one in progressSimon Knox2017-10-241-1/+1
| | * | | | Merge branch 'multi-file-editor-separate-commits-call' into 'master'Filipa Lacerda2017-11-072-3/+51
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | correctly updates commit data after committing changesPhil Hughes2017-11-062-3/+51
* | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsKamil Trzcinski2017-11-073-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Shinya Maeda2017-11-072-27/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-073-3/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'multiple-query-prometheus-graphs' into 'master'Tim Zallmann2017-11-073-3/+3
| | |\ \ \ \ \
| | | * | | | | fix karma failuresMike Greiling2017-11-063-3/+3
* | | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsKamil Trzcinski2017-11-075-77/+57
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Use flash for dismissable alertsEric Eastwood2017-11-071-25/+5
| * | | | | | | Update Cluster application install to be enabled when erroredEric Eastwood2017-11-071-2/+2
| |/ / / / / /
| * | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Shinya Maeda2017-11-076-79/+695
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'es-module-copy_as_gfm' into 'master'Filipa Lacerda2017-11-063-50/+50
| |\ \ \ \ \ \
| | * | | | | | fix broken module importMike Greiling2017-11-011-1/+3
| | * | | | | | remove global export except in test environmentsMike Greiling2017-11-012-49/+47
* | | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsEric Eastwood2017-11-066-35/+79
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-11-066-35/+79
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '20666-404-error-issue-assigned-with-issues-disabled' into 'master'Clement Ho2017-11-062-8/+23
| | |\ \ \ \ \ \
| | | * | | | | | Fixes 404 error to `Issues assigned to me` and `Issues I've created` when iss...Jacopo2017-11-062-8/+23
| | * | | | | | | Merge branch 'refactor-clusters' into 'master'Grzegorz Bizon2017-11-061-1/+1
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'fix-md-form-tabs-double-click-toggle' into 'master'Clement Ho2017-11-062-5/+32
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | FE review, replace timeout with nexttick and improve assertion helper. add ch...fix-md-form-tabs-double-click-toggleLuke "Jared" Bennett2017-11-041-16/+14
| | | * | | | | | | Fix karmaLuke "Jared" Bennett2017-11-021-4/+6
| | | * | | | | | | Correct selector in field_specLuke "Jared" Bennett2017-11-011-1/+1
| | | * | | | | | | Let field.vue handle the changing of previewLuke "Jared" Bennett2017-11-011-2/+2
| | | * | | | | | | Use settimeoutpromise in field_specLuke "Jared" Bennett2017-11-011-23/+14
| | | * | | | | | | Dont emit toggle-markdown event if current target is already active and add s...Luke "Jared" Bennett2017-11-011-0/+36
| | * | | | | | | | Merge branch 'winh-skip-parsePikadayDate-test' into 'master'Filipa Lacerda2017-11-061-4/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Remove parsePikadayDate testwinh-skip-parsePikadayDate-testWinnie Hellmann2017-11-061-4/+2
| | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | Use Vue warnhandlerwinh-use-vue-warnhandlerWinnie Hellmann2017-11-061-18/+22
| | |/ / / / / / /
* | | | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsEric Eastwood2017-11-061-2/+19
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch '36629-35958-add-cluster-application-section' into '38464-k8s-apps'Kamil TrzciƄski2017-11-066-79/+695
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-061-2/+19
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |