summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Remove initLegacyFilters reference in dispatcherdispatcher-dashboard-mrClement Ho2018-01-101-1/+0
|
* Refactor dispatcher dashboard mr pathClement Ho2018-01-102-2/+10
|
* Merge branch 'merge-request-lfs-badge' into 'master'Douwe Maan2018-01-101-0/+3
|\ | | | | | | | | | | | | Added LFS badge to merge request files tracked by LFS Closes #41829 See merge request gitlab-org/gitlab-ce!16345
| * Added LFS to merge request files tracked by LFSmerge-request-lfs-badgePhil Hughes2018-01-101-0/+3
| | | | | | | | Closes #41829
* | 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-0859-681/+958
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | Fixes more eslint rulesFilipa Lacerda2018-01-0627-455/+486
| | | |
| * | | [ci skip] Fix more eslint rulesFilipa Lacerda2018-01-0628-531/+593
| | | |
| * | | [ci skip] Fix conflictsFilipa Lacerda2018-01-051-28/+4
| | | |
| * | | Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-0568-343/+864
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (78 commits) Use --left-right and --max-count for counting diverging commits API: get participants from merge_requests & issues Copy Mermaid graphs as GFM Rephrase paragraph about e2e tests in merge requests in docs Remove EE only sections from docs Update redis-rack to 2.0.4 Refactor matchers for background migrations Add id to modal.vue to support data-toggle="modal" Allow local tests to use a modified Gitaly Fix specs Use computed prop in expand button Update check.md add deprecation and removal issue to docs Add status attribute to runner api entity Fix typos in a code comment Refactor RelativePositioning so that it can be used by other classes Backport 'Rebase' feature from EE to CE Just try to detect and assign once Fix custom name in branch creation for issue in Firefox Modify `LDAP::Person` to return username value based on attributes ...
| * | | | [ci skip] Fix more eslint rulesFilipa Lacerda2018-01-057-380/+380
| | | | |
| * | | | [ci skip] Fix more rulesFilipa Lacerda2018-01-0534-920/+1035
| | | | |
| * | | | [ci skip] Fix more eslint rulesFilipa Lacerda2018-01-0510-272/+415
| | | | |
| * | | | [ci skip] Fix more rulesFilipa Lacerda2018-01-0574-2160/+2377
| | | | |
| * | | | [ci skip] Fix more rulesFilipa Lacerda2018-01-0415-469/+464
| | | | |
| * | | | [ci skip] Fix some rulesFilipa Lacerda2018-01-047-134/+155
| | | | |
| * | | | Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-0443-165/+607
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (33 commits) Include integration tests in CE/EE testing documentation 41054-Disallow creation of new Kubernetes integrations Resolve "Resizable file list and commit panel" Make tooltip placement bottom by default as per design guidelines Fix groups list icon, timestamp alignment and row height Avoid leaving a push event empty if payload cannot be created Use heredoc for long strings so it's easier to read Simplify metrics fetching for closed/merged MRs Better English Fix method lookup Use a background migration for issues.closed_at Handle Gitaly aborted merge due to branch update Fix API endpoints to edit wiki pages where project belongs to a group Fixes spec failures due to not returning metrics for MRs other than closed/merged Cache merged and closed events data in merge_request_metrics table Update test to remove carent icon check Update styles to fix SVG caret alignment Update selector to test SVG icon name Use SVG sprite icons Add support for max_count option to Git::Repository#count_commits ...
| * | | | | Adds `eslint-plugin-vue`, fixes linter errors and adds docsFilipa Lacerda2018-01-0327-214/+265
| | | | | |
* | | | | | Merge branch 'dispatcher-dashboard-projects' into 'master'Phil Hughes2018-01-102-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher dashboard projects route See merge request gitlab-org/gitlab-ce!16321
| * | | | | | Fix indentiondispatcher-dashboard-projectsClement Ho2018-01-091-1/+3
| | | | | | |
| * | | | | | Refactor dispatcher dashboard projects routeClement Ho2018-01-092-0/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'dispatcher-dashboard-issues' into 'master'Phil Hughes2018-01-102-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher dashboard issues path See merge request gitlab-org/gitlab-ce!16305
| * | | | | | Fix indentiondispatcher-dashboard-issuesClement Ho2018-01-091-1/+3
| | | | | | |
| * | | | | | Fix eslintClement Ho2018-01-081-1/+1
| | | | | | |
| * | | | | | Refactor dashboard issuesClement Ho2018-01-082-0/+9
| |/ / / / /
* | | | | | Refactor dashboard milestone show inside dispatcherClement Ho2018-01-102-1/+12
| | | | | |
* | | | | | Refactor dashboard milestone index inside dispatcherClement Ho2018-01-102-1/+6
| | | | | |
* | | | | | Merge branch 'fix/sidebar-collapse-button-spacing' into 'master'Phil Hughes2018-01-101-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore sidebar collapse button padding #41803 See merge request gitlab-org/gitlab-ce!16323
| * | | | | | Restore sidebar collapse button paddingGeorge Tsiolis2018-01-091-1/+0
| | | | | | |
* | | | | | | Fix hooks not being set up properly for bare import Rake tasksh-fix-bare-import-hooksStan Hu2018-01-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #41739
* | | | | | | Revert "Fix Route validation for unchanged path"Michael Kozono2018-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8040edcce8b4e736b4f4857e6709f94aeb5e274c.
* | | | | | | Fix Route validation for unchanged pathMichael Kozono2018-01-091-1/+1
| | | | | | |
* | | | | | | Merge branch '41570-max-height-dropdown' into 'master'Phil Hughes2018-01-095-11/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Download menu expands past the fold and doesn't auto size to the bottom height of the browser window" Closes #41570 See merge request gitlab-org/gitlab-ce!16299
| * | | | | | Change max-height of all dropdowns to 312px41570-max-height-dropdownAnnabel Dunstone Gray2018-01-085-11/+7
| | | | | | |
* | | | | | | Merge branch 'changes-dropdown-ellipsis' into 'master'Sean McGivern2018-01-093-4/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix changes dropdown ellipsis working across browsers Closes #41561 and #41684 See merge request gitlab-org/gitlab-ce!16281
View Lorry Controller Status