Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Backport fix epic fullscreenbackport-fix-epic-fullscreen | Clement Ho | 2017-11-22 | 1 | -65/+81 | |
| | | | | | ||||||
* | | | | | Merge branch 'backport-add-epic-sidebar' into 'master' | Fatih Acet | 2017-11-27 | 7 | -5/+329 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | Backport of add-epic-sidebar See merge request gitlab-org/gitlab-ce!15335 | |||||
| * | | | | Merge branch 'master' into 'backport-add-epic-sidebar' | Clement Ho | 2017-11-15 | 10 | -143/+263 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/lib/utils/text_utility.js | |||||
| * \ \ \ \ | Merge branch 'master' into backport-add-epic-sidebar | Clement Ho | 2017-11-13 | 14 | -90/+2020 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Backport of add-epic-sidebar | Clement Ho | 2017-11-10 | 7 | -9/+331 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'fix-mermaid-import' into 'master' | Filipa Lacerda | 2017-11-23 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed import of render mermaid & render math methods See merge request gitlab-org/gitlab-ce!15550 | |||||
| * | | | | | | | moved to es6 modulesfix-mermaid-import | Phil Hughes | 2017-11-22 | 1 | -2/+0 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Improve environments performance | Filipa Lacerda | 2017-11-23 | 10 | -221/+290 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch 'jivl-replace-vue-resource-prometheus-dashboard' into 'master' | Filipa Lacerda | 2017-11-22 | 2 | -18/+9 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | Replace vue-resource for axios in the Prometheus Dashboard See merge request gitlab-org/gitlab-ce!15547 | |||||
| * | | | | | Replaced vue-resource for axios in the prometheus dashboardjivl-replace-vue-resource-prometheus-dashboard | Jose Ivan Vargas | 2017-11-22 | 2 | -18/+9 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'feature_add_mermaid' into 'master' | Phil Hughes | 2017-11-22 | 1 | -1/+2 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support of Mermaid Closes #3711 See merge request gitlab-org/gitlab-ce!15107 | |||||
| * | | | | | Add support of Mermaid | Vitaliy @blackst0ne Klachkov | 2017-11-22 | 1 | -1/+2 | |
| | | | | | | ||||||
* | | | | | | Merge branch '38869-milestone' into 'master' | Phil Hughes | 2017-11-21 | 1 | -2/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export code as ES6 modules See merge request gitlab-org/gitlab-ce!15503 | |||||
| * | | | | | | Export code as ES6 modules38869-milestone | Filipa Lacerda | 2017-11-20 | 1 | -2/+1 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Backport ability to enable/disable file attachments in issuable form | Clement Ho | 2017-11-21 | 1 | -0/+37 | |
|/ / / / / | ||||||
* | | | | | Async notification subscriptions in issue boards | Eric Eastwood | 2017-11-20 | 3 | -14/+29 | |
| | | | | | ||||||
* | | | | | Use axios instead of vue resource - step 1 | Filipa Lacerda | 2017-11-20 | 1 | -12/+8 | |
|/ / / / | ||||||
* | | | | Merge branch 'rc/use-existing-url-helper' into 'master' | Grzegorz Bizon | 2017-11-17 | 1 | -1/+0 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Replace ci_status_path with pipeline_path See merge request gitlab-org/gitlab-ce!15369 | |||||
| * | | | | Replace ci_status_path with pipeline_pathrc/use-existing-url-helper | Rémy Coutable | 2017-11-14 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
* | | | | | Resolve "lock/confidential issuable sidebar custom svg icons iteration" | Luke "Jared" Bennett | 2017-11-16 | 1 | -3/+3 | |
| | | | | | ||||||
* | | | | | Backport delete epic changesbackport-delete-epic | Clement Ho | 2017-11-15 | 3 | -14/+63 | |
| |_|_|/ |/| | | | ||||||
* | | | | Merge branch ↵ | Mike Greiling | 2017-11-15 | 1 | -0/+17 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39861-follow-up-from-enable-multiple-queries-per-prometheus-graph' into 'master' Resolve "Follow-up from "Enable multiple queries per Prometheus graph"" Closes #39861 See merge request gitlab-org/gitlab-ce!15363 | |||||
| * | | | | Add missing spec for computed prop strokeDashArray39861-follow-up-from-enable-multiple-queries-per-prometheus-graph | Jose Ivan Vargas | 2017-11-13 | 1 | -0/+17 | |
| | |_|/ | |/| | | ||||||
* | | | | 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 |