summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |/ /
* | | Fix up Web IDE user preference copy and buttonsJose Ivan Vargas2018-01-111-0/+0
| |/ |/|
* | Merge branch '41600-wider-project-readme-on-fixed-layout' into 'master'Annabel Dunstone Gray2018-01-111-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Too narrow project READMEs on fixed layout Closes #41600 See merge request gitlab-org/gitlab-ce!16181
| * | Make project README containers wider on fixed layoutTakuya Noguchi2018-01-031-1/+1
| | |
* | | Merge branch '41709-rich-blob-viewer-margins-for-pc' into 'master'Annabel Dunstone Gray2018-01-112-12/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make rich blob viewer wider for PC Closes #41709 See merge request gitlab-org/gitlab-ce!16262
| * | | Make rich blob viewer wider for PCTakuya Noguchi2018-01-102-12/+1
| | | |
* | | | 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-10203-5345/+6044
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | # 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
| | | | | |
* | | | | | Merge branch 'projects-a-refactor' into 'master'Fatih Acet2018-01-104-7/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | projects:a* dispatcher refactor See merge request gitlab-org/gitlab-ce!16300
| * | | | | | Fix indention and bad conflict mergeprojects-a-refactorClement Ho2018-01-101-7/+6
| | | | | | |
| * | | | | | Merge branch 'master' into 'projects-a-refactor'Clement Ho2018-01-10203-5344/+6042
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js
| * | | | | | Finishes dispatcher `projects:a*` stuff.Jacob Schatz2018-01-083-5/+22
| | | | | | |
| * | | | | | Fix `projects:a*` refactor for dispatcherJacob Schatz2018-01-082-2/+11
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '41491-fix-nil-blob-name-error' into 'master'Annabel Dunstone Gray2018-01-101-1/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error when visiting a commit where the blobs do not exist (nil blobs) Closes #41491 See merge request gitlab-org/gitlab-ce!16237
| * | | | | Fix 500 when visiting a commit where blobs do not exist (nil blobs)41491-fix-nil-blob-name-errorEric Eastwood2018-01-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41491
* | | | | | 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
| | | | | | |
| * | | | | | Fix broken test for application rowFilipa Lacerda2018-01-091-2/+2
| | | | | | |
| * | | | | | Fix broken tests for project list and headerFilipa Lacerda2018-01-092-2/+2
| | | | | | |
| * | | | | | Fix application row specsFilipa Lacerda2018-01-091-7/+7
| | | | | | |
| * | | | | | [ci skip] Fix pagination specsFilipa Lacerda2018-01-091-4/+3
| | | | | | |
| * | | | | | Fix last eslint rulesFilipa Lacerda2018-01-088-155/+167
| | | | | | |
| * | | | | | Fix more eslint rulesFilipa Lacerda2018-01-0827-353/+402
| | | | | | |
| * | | | | | Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-0826-521/+657
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (140 commits) Add Gitter room link to I want to contribute since you always have questions Use workhorse 3.4.0 chore: remove symbolic link Add memoization for properties Resolve "Allow QA tests to run with `CHROME_HEADLESS=false`" Resolve "Add graph value to hover" Fix slash commands dropdown description disables the shortcut to the issue boards when issues are disabled Fix static analysys Disable STI of ActiveRecord. Refactoring specs. Fix StaticSnalysys Fix change log Add changelog Revert bulk_insert and bring back AR insert(one by one) Add a new test for emptified params Use batch update for Service deactivation Fix query to look for proper unmanaged kubernetes service Fix static anylysy Use bulk_insert instead of AR create Opitmize migration process by using both unmanaged_kubernetes_service and kubernetes_service_without_template ...
View Lorry Controller Status