summaryrefslogtreecommitdiff
path: root/spec/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* Remove ineffective Vue service specsremove-ineffective-service-specsEric Eastwood2017-11-082-113/+0
|
* Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵Kamil Trzcinski2017-11-074-125/+190
|\ | | | | | | into add-ingress-to-cluster-applications
| * 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
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | don't re-run smart interval callback if there is already one in progress Closes #38394 See merge request gitlab-org/gitlab-ce!15032
| | | * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-11-0714-91/+152
| | | |\ | | | | | | | | | | | | | | | 38394-smarter-interval
| | | * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-11-0685-1510/+3613
| | | |\ \ | | | | | | | | | | | | | | | | | | 38394-smarter-interval
| | | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | because some things take time
| | * | | | Merge branch 'multi-file-editor-separate-commits-call' into 'master'Filipa Lacerda2017-11-072-3/+51
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Multi-file editor fetch log data from a different endpoint Closes #38360 See merge request gitlab-org/gitlab-ce!15132
| | | * | | correctly updates commit data after committing changesPhil Hughes2017-11-062-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also merges data in after a fetch to save overriting all data. changed the render keys to save a full re-render when any data changes
* | | | | | 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 ↵Shinya Maeda2017-11-072-27/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into 38464-k8s-apps
| * \ \ \ \ \ 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
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable multiple queries per Prometheus graph See merge request gitlab-org/gitlab-ce!15201
| | | * | | | | 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 ↵Shinya Maeda2017-11-076-79/+695
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | into 38464-k8s-apps
| * | | | | | Merge branch 'es-module-copy_as_gfm' into 'master'Filipa Lacerda2017-11-063-50/+50
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert copy_as_gfm into ES module and move to behaviors See merge request gitlab-org/gitlab-ce!14859
| | * | | | | | 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
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: db/schema.rb
| | * | | | | | 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 issues are disabled Closes #20666 See merge request gitlab-org/gitlab-ce!15021
| | | * | | | | | Fixes 404 error to `Issues assigned to me` and `Issues I've created` when ↵Jacopo2017-11-062-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues are disabled The dropdown options `Issues assigned to me` and `Issues I've created` in project search are now hidden when issues are disabled on the project.
| | * | | | | | | Merge branch 'refactor-clusters' into 'master'Grzegorz Bizon2017-11-061-1/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform See merge request gitlab-org/gitlab-ce!14879
| | * \ \ \ \ \ \ \ Merge branch 'fix-md-form-tabs-double-click-toggle' into 'master'Clement Ho2017-11-062-5/+32
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix md form tab double click toggle Closes #39624 See merge request gitlab-org/gitlab-ce!15119
| | | * | | | | | | FE review, replace timeout with nexttick and improve assertion helper. add ↵fix-md-form-tabs-double-click-toggleLuke "Jared" Bennett2017-11-041-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changelog
| | | * | | | | | | 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 ↵Luke "Jared" Bennett2017-11-011-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specs
| | * | | | | | | | Merge branch 'winh-skip-parsePikadayDate-test' into 'master'Filipa Lacerda2017-11-061-4/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporarily remove parsePikadayDate test Closes #39834 See merge request gitlab-org/gitlab-ce!15217
| | | * | | | | | | | 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
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Add applications section to GKE clusters page See merge request gitlab-org/gitlab-ce!15064
| * | | | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-061-2/+19
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'36248-repo-editor-double-border-under-repo-file-buttonsFilipa Lacerda2017-11-061-2/+19
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added discussion_line_code value to note response and use it to query the right… Closes #38677 See merge request gitlab-org/gitlab-ce!14981
| | | * | | | | | FE review changes - remove internal details assertion and look for closest ↵Luke "Jared" Bennett2017-10-271-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | form if no discussion_line_code
| | | * | | | | | Add spec for root diff discussion noteLuke "Jared" Bennett2017-10-241-2/+22
| | | | | | | | |
| | | * | | | | | Fix karmaLuke "Jared" Bennett2017-10-231-0/+1
| | | | |/ / / / | | | |/| | | |
* | | | | | | | Merge branch '36629-35958-add-cluster-application-section' into ↵Eric Eastwood2017-11-063-12/+81
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-ingress-to-cluster-applications Conflicts: app/assets/javascripts/clusters/clusters_bundle.js app/assets/javascripts/clusters/components/application_row.vue app/assets/javascripts/clusters/services/clusters_service.js
| * | | | | | | Add FE tests for not_installable/scheduled and cluster banner rules36629-35958-add-cluster-application-sectionEric Eastwood2017-11-063-12/+81
| | | | | | | |
* | | | | | | | Add Ingress to cluster applications sectionEric Eastwood2017-11-031-1/+1
|/ / / / / / /
* | | | | | | Add applications section to GKE clusters pageEric Eastwood2017-11-036-79/+626
|/ / / / / /
View Lorry Controller Status