Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'update-emoji-digests-with-latest-from-gemojione' into 'master' | Filipa Lacerda | 2017-11-15 | 2 | -7/+31 |
|\ | | | | | | | | | | | | | Update Emoji digests and assets with latest from Gemojione v3.3.0 Closes #32634 See merge request gitlab-org/gitlab-ce!15390 | ||||
| * | Add rainbow_flag to emoji support map | Eric Eastwood | 2017-11-15 | 2 | -7/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested on the following platforms that split the emoji into separate characters currently. - Windows 10 FCU - Chrome 62.0.3202.89 - Firefox 57.0b14 - MS Edge 41.16299.15.0 - macOS 10.12.6 - Chrome 63.0.3239.40 - Safari 11.0.1 (12604.3.5.1.1) - Firefox 57.0 - Ubuntu 16.04 - Chromium 62.0.3202.75 - Firefox 56.0 | ||||
* | | Merge branch 'ce-backport-39009-fix-approvals-showing-up-in-empty-mr-widget' ↵ | Phil Hughes | 2017-11-15 | 1 | -9/+10 |
|\ \ | |/ |/| | | | | | | | | | into 'master' Remove approvals when in empty MR widget state -- CE backport See merge request gitlab-org/gitlab-ce!15362 | ||||
| * | Backport spec changes from EE remove approvals in empty statece-backport-39009-fix-approvals-showing-up-in-empty-mr-widget | Eric Eastwood | 2017-11-13 | 1 | -9/+10 |
| | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3376 | ||||
* | | Stops page reload when changing tabs or pages - uses API requests instead | Filipa Lacerda | 2017-11-14 | 5 | -126/+179 |
| | | |||||
* | | Formats bytes to human reabale number in registry table40092-fix-cluster-size | Filipa Lacerda | 2017-11-13 | 1 | -1/+26 |
|/ | |||||
* | fix to allow integer label refernces | haseeb | 2017-11-13 | 1 | -0/+22 |
| | |||||
* | Merge branch 'multi-editor-store-specs' into 'master' | Filipa Lacerda | 2017-11-13 | 11 | -5/+1901 |
|\ | | | | | | | | | Added tests to multi-file Vuex store See merge request gitlab-org/gitlab-ce!15147 | ||||
| * | added missing specsmulti-editor-store-specs | Phil Hughes | 2017-11-10 | 1 | -0/+211 |
| | | |||||
| * | fixed specs | Phil Hughes | 2017-11-10 | 2 | -39/+13 |
| | | |||||
| * | file action specs | Phil Hughes | 2017-11-10 | 1 | -1/+349 |
| | | |||||
| * | file action specs | Phil Hughes | 2017-11-10 | 1 | -0/+44 |
| | | |||||
| * | tree actions specs | Phil Hughes | 2017-11-10 | 2 | -5/+452 |
| | | |||||
| * | test updates | Phil Hughes | 2017-11-10 | 3 | -171/+120 |
| | | |||||
| * | Added tests to multi-file Vuex store | Phil Hughes | 2017-11-10 | 11 | -7/+930 |
| | | |||||
* | | Export text utils as ES6 modules | Filipa Lacerda | 2017-11-13 | 2 | -84/+94 |
|/ | |||||
* | Merge branch 'disable-issue-action-button-if-isSubmitting' into 'master' | Fatih Acet | 2017-11-09 | 1 | -0/+19 |
|\ | | | | | | | | | Disable issue action button whilst submitting and test See merge request gitlab-org/gitlab-ce!15211 | ||||
| * | Disable issue action button whilst submitting and testdisable-issue-action-button-if-isSubmitting | Luke "Jared" Bennett | 2017-11-06 | 1 | -0/+19 |
| | | |||||
* | | Merge branch 'move-filter-mr-clear-search-spec-to-js' into 'master' | Tim Zallmann | 2017-11-09 | 1 | -0/+19 |
|\ \ | | | | | | | | | | | | | Move clear search test to JS to reduce overkill See merge request gitlab-org/gitlab-ce!15154 | ||||
| * | | Move clear search test to JS to reduce overkillmove-filter-mr-clear-search-spec-to-js | Eric Eastwood | 2017-11-09 | 1 | -0/+19 |
| | | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/33661 | ||||
* | | | Merge branch 'remove-ineffective-service-specs' into 'master' | Filipa Lacerda | 2017-11-08 | 2 | -113/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | Remove ineffective Vue service specs See merge request gitlab-org/gitlab-ce!15277 | ||||
| * | | | Remove ineffective Vue service specsremove-ineffective-service-specs | Eric Eastwood | 2017-11-08 | 2 | -113/+0 |
| |/ / | |||||
* | | | Resolve "Merge request widget - CI information has different margins" | Filipa Lacerda | 2017-11-08 | 1 | -82/+89 |
| | | | |||||
* | | | Merge branch 'fl-cleanup-test' into 'master' | Tim Zallmann | 2017-11-08 | 1 | -23/+0 |
|\ \ \ | |/ / |/| | | | | | | | | Cleanup tests See merge request gitlab-org/gitlab-ce!15261 | ||||
| * | | Update mr_widget_options_spec.jsfl-cleanup-test | Filipa Lacerda | 2017-11-07 | 1 | -1/+0 |
| | | | |||||
| * | | Cleanup tests | Filipa Lacerda | 2017-11-07 | 1 | -22/+0 |
| | | | |||||
* | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵ | Kamil Trzcinski | 2017-11-07 | 4 | -125/+190 |
|\ \ \ | |/ / | | | | | | | into add-ingress-to-cluster-applications | ||||
| * | | Merge branch 'master' into 38464-k8s-apps | Shinya Maeda | 2017-11-08 | 4 | -125/+190 |
| |\ \ | |||||
| | * \ | Merge branch '38394-smarter-interval' into 'master' | Filipa Lacerda | 2017-11-07 | 2 | -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 Knox | 2017-11-07 | 14 | -91/+152 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | 38394-smarter-interval | ||||
| | | * \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Simon Knox | 2017-11-06 | 85 | -1510/+3613 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | 38394-smarter-interval | ||||
| | | * | | | | review feedback - throw error in smart_callback catch block | Simon Knox | 2017-11-02 | 1 | -6/+9 |
| | | | | | | | |||||
| | | * | | | | remove global export from SmartInterval | Simon Knox | 2017-10-31 | 2 | -132/+134 |
| | | | | | | | |||||
| | | * | | | | add changelog and spec | Simon Knox | 2017-10-27 | 1 | -0/+12 |
| | | | | | | | |||||
| | | * | | | | don't re-run smart interval callback if there is already one in progress | Simon Knox | 2017-10-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | because some things take time | ||||
| | * | | | | | Merge branch 'multi-file-editor-separate-commits-call' into 'master' | Filipa Lacerda | 2017-11-07 | 2 | -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 changes | Phil Hughes | 2017-11-06 | 2 | -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-applications | Kamil Trzcinski | 2017-11-07 | 3 | -3/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵ | Shinya Maeda | 2017-11-07 | 2 | -27/+7 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into 38464-k8s-apps | ||||
| * \ \ \ \ \ | Merge branch 'master' into 38464-k8s-apps | Shinya Maeda | 2017-11-07 | 3 | -3/+3 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge branch 'multiple-query-prometheus-graphs' into 'master' | Tim Zallmann | 2017-11-07 | 3 | -3/+3 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable multiple queries per Prometheus graph See merge request gitlab-org/gitlab-ce!15201 | ||||
| | | * | | | | | fix karma failures | Mike Greiling | 2017-11-06 | 3 | -3/+3 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applications | Kamil Trzcinski | 2017-11-07 | 5 | -77/+57 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Use flash for dismissable alerts | Eric Eastwood | 2017-11-07 | 1 | -25/+5 |
| | | | | | | | | |||||
| * | | | | | | | Update Cluster application install to be enabled when errored | Eric Eastwood | 2017-11-07 | 1 | -2/+2 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵ | Shinya Maeda | 2017-11-07 | 6 | -79/+695 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | into 38464-k8s-apps | ||||
| * | | | | | | Merge branch 'es-module-copy_as_gfm' into 'master' | Filipa Lacerda | 2017-11-06 | 3 | -50/+50 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert copy_as_gfm into ES module and move to behaviors See merge request gitlab-org/gitlab-ce!14859 | ||||
| | * | | | | | | fix broken module import | Mike Greiling | 2017-11-01 | 1 | -1/+3 |
| | | | | | | | | |||||
| | * | | | | | | remove global export except in test environments | Mike Greiling | 2017-11-01 | 2 | -49/+47 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applications | Eric Eastwood | 2017-11-06 | 6 | -35/+79 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | |