summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dispatcher-dashboard-mr' into 'master'Fatih Acet2018-01-112-3/+10
|\ | | | | | | | | Refactor dispatcher dashboard mr path See merge request gitlab-org/gitlab-ce!16360
| * Remove initLegacyFilters reference in dispatcherdispatcher-dashboard-mrClement Ho2018-01-101-1/+0
| |
| * Refactor dispatcher dashboard mr pathClement Ho2018-01-102-2/+10
| |
* | Merge branch 'dispatcher-boards' into 'master'Fatih Acet2018-01-112-2/+11
|\ \ | | | | | | | | | | | | Refactor dispatcher project boards path See merge request gitlab-org/gitlab-ce!16374
| * | Refactor dispatcher project boards pathdispatcher-boardsClement Ho2018-01-102-2/+11
| |/
* | Merge branch '41163-improve-cluster-ingress-extra-cost-language' into 'master'Fatih Acet2018-01-111-6/+7
|\ \ | | | | | | | | | | | | | | | | | | Improve wording about additional costs with Ingress on GKE or custom clusters Closes #41163 See merge request gitlab-org/gitlab-ce!16370
| * | Update Ingress extra cost note to be more generic41163-improve-cluster-ingress-extra-cost-languageEric Eastwood2018-01-111-6/+7
| |/ | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41163
* | Merge branch 'main-js-tidy-up' into 'master'Filipa Lacerda2018-01-1123-129/+123
|\ \ | | | | | | | | | | | | Tidy up main JS file See merge request gitlab-org/gitlab-ce!16007
| * | Tidy up main JS filemain-js-tidy-upPhil Hughes2018-01-1023-129/+123
| | |
* | | Merge branch 'help-profiles-dispatcher-refactor' into 'master'Phil Hughes2018-01-114-11/+24
|\ \ \ | | | | | | | | | | | | | | | | Refactored profile:* and help:* imports in dispatcher See merge request gitlab-org/gitlab-ce!16330
| * \ \ Resolved conflicts in dispatcher.jshelp-profiles-dispatcher-refactorConstance Okoghenun2018-01-11218-5184/+6026
| |\ \ \
| * | | | Removed experimental feature flag unsed depenecy for profiles/preferencesConstance Okoghenun2018-01-112-9/+3
| | | | |
| * | | | Refactored profile:* and help:* imports in dispatcherConstance Okoghenun2018-01-095-6/+27
| | | | |
* | | | | Refactored project:n* imports in dispatcher.jsConstance Okoghenun2018-01-114-20/+42
| |/ / / |/| | |
* | | | Merge branch '41608-clipboard-vue-button' into 'master'Phil Hughes2018-01-111-1/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "clipboard-button tooltip is broken" Closes #41608 See merge request gitlab-org/gitlab-ce!16352
| * | | | Adds props to allow tooltip config. Breaks tests into specific cases41608-clipboard-vue-buttonFilipa Lacerda2018-01-111-0/+12
| | | | |
| * | | | Add tooltip missing to clipboard componentFilipa Lacerda2018-01-101-1/+6
| | |_|/ | |/| | | | | | | | | | Adds tests
* | | | Merge branch '41613-fix-redundant-modal' into 'master'Filipa Lacerda2018-01-112-66/+68
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make modal dialog common for Groups tree app Closes #41613 See merge request gitlab-org/gitlab-ce!16311
| * | | | Add modal dialog for leave group actionKushal Pandya2018-01-111-11/+37
| | | | |
| * | | | Move modal dialog to app root componentKushal Pandya2018-01-111-55/+31
| | | | |
* | | | | Merge branch 'admin-dispatcher' into 'master'Filipa Lacerda2018-01-1116-22/+93
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Admin dispatcher JS imports See merge request gitlab-org/gitlab-ce!16315
| * | | | | Uses `callDefault`admin-dispatcherPhil Hughes2018-01-111-11/+33
| | | | | |
| * | | | | Admin dispatcher JS importsPhil Hughes2018-01-1116-22/+71
| | | | | |
* | | | | | Merge branch 'dispatcher-dashboard-activities' into 'master'Filipa Lacerda2018-01-112-1/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Refactor dashboard activities path See merge request gitlab-org/gitlab-ce!16361
| * | | | | Refactor dashboard activities pathdispatcher-dashboard-activitiesClement Ho2018-01-102-1/+6
| | |/ / / | |/| | |
* | | | | Merge branch 'dispatcher-sessions' into 'master'Phil Hughes2018-01-115-7/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher sessions path See merge request gitlab-org/gitlab-ce!16362
| * | | | | Fix importClement Ho2018-01-101-1/+1
| | | | | |
| * | | | | Refactor dispatcher sessions pathClement Ho2018-01-105-6/+14
| |/ / / /
* | | | | Merge branch 'dispatcher-search' into 'master'Phil Hughes2018-01-113-4/+8
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Refactor dispatcher search path See merge request gitlab-org/gitlab-ce!16366
| * | | | Refactor dispatcher search pathdispatcher-searchClement Ho2018-01-103-4/+8
| |/ / /
* | | | Merge branch 'explore-dispatcher-refactor' into 'master'Fatih Acet2018-01-103-15/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactors the dispatcher for `explore:*`. See merge request gitlab-org/gitlab-ce!16296
| * | | | Code improvements and fix bad conflict mergeexplore-dispatcher-refactorClement Ho2018-01-102-5/+1
| | | | |
| * | | | Merge branch 'master' into 'explore-dispatcher-refactor'Clement Ho2018-01-10196-5330/+6028
| |\ \ \ \ | | |/ / / | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js
| * | | | Fix eslintJacob Schatz2018-01-083-13/+11
| | | | |
| * | | | Merge branch 'master' into explore-dispatcher-refactorJacob Schatz2018-01-083-6/+9
| |\ \ \ \
| * | | | | Fixes duplicationJacob Schatz2018-01-081-16/+0
| | | | | |
| * | | | | Updating dispatcher without code fixesJacob Schatz2018-01-083-410/+357
| | | | | |
| * | | | | Refactor `explore:*`Jacob Schatz2018-01-083-342/+428
| | | | | |
* | | | | | Fix indention and bad conflict mergeprojects-a-refactorClement Ho2018-01-101-7/+6
| | | | | |
* | | | | | Merge branch 'master' into 'projects-a-refactor'Clement Ho2018-01-10196-5329/+6026
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js
| * | | | | Merge branch 'ph-dispatcher-1' into 'master'Filipa Lacerda2018-01-106-8/+25
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added dispatcher imports for some routes See merge request gitlab-org/gitlab-ce!16284
| | * | | | | Added admin:conversational_development_index:show import to dispatcherph-dispatcher-1Phil Hughes2018-01-092-1/+4
| | | | | | |
| | * | | | | Added import:fogbugz:new_user_map import to dispatcherPhil Hughes2018-01-092-1/+4
| | | | | | |
| | * | | | | Added ci:lints import to dispatcherPhil Hughes2018-01-093-2/+4
| | | | | | |
| | * | | | | Added import for snippets:show in dispatcherPhil Hughes2018-01-092-4/+13
| | | |/ / / | | |/| | | | | | | | | | | | | | | #41341
| * | | | | Merge branch '34312-eslint-vue-plugin' into 'master'Phil Hughes2018-01-10181-5129/+5776
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add eslint-vue-plugin to our stack" Closes #34312 See merge request gitlab-org/gitlab-ce!16210
| | * | | | Fix broken modalFilipa Lacerda2018-01-101-1/+1
| | | | | |
| | * | | | Disable rule in modal.vue breaking testsFilipa Lacerda2018-01-091-5/+3
| | | | | |
| | * | | | Fix broken testsFilipa Lacerda2018-01-092-100/+98
| | | | | |
| | * | | | Fix broken specsFilipa Lacerda2018-01-095-22/+10
| | | | | |
View Lorry Controller Status