summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | [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-0418-478/+483
| | | | | | | | |
| * | | | | | | | [ci skip] Fix some rulesFilipa Lacerda2018-01-048-135/+156
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-04107-340/+2177
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | | | | | | Move dependencies to dev dependenciesFilipa Lacerda2018-01-042-9/+9
| | | | | | | | | |
| * | | | | | | | | Adds `eslint-plugin-vue`, fixes linter errors and adds docsFilipa Lacerda2018-01-0333-226/+333
| | | | | | | | | |
* | | | | | | | | | Merge branch 'remove-beta-notice-for-clusters' into 'master'Achilleas Pipinellis2018-01-101-3/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Beta notice for Clusters See merge request gitlab-org/gitlab-ce!16350
| * | | | | | | | | Remove Beta notice for ClustersFabio Busatto2018-01-101-3/+0
|/ / / / / / / / /
* | | | | | | | | 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
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'zj-migrate-gitlab-project-rm-mv' into 'master'Douwe Maan2018-01-104-90/+41
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate GitlabProject (re)move project endpoints Closes gitaly#873 See merge request gitlab-org/gitlab-ce!16249
| * | | | | | | | | | Migrate GitlabProject (re)move project endpointsZeger-Jan van de Weg2018-01-094-90/+41
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migration is done through a small refactoring, which makes us call endpoins which are performing the same actions for namespaces. Tests are added to ensure only the project is removed that should be removed. Closes gitlab-org/gitaly#873
* | | | | | | | | | Merge branch 'fix/use-mirror-refmaps-instead-mirror-refmap' into 'master'Sean McGivern2018-01-104-7/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for multiple refmaps to RemoteService#add_remote Closes gitaly#903 See merge request gitlab-org/gitlab-ce!16331
| * | | | | | | | | | Add support for multiple refmaps to RemoteService#add_remotefix/use-mirror-refmaps-instead-mirror-refmapAhmad Sherif2018-01-094-7/+9
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#903
* | | | | | | | | | Merge branch 'dispatcher-dashboard-milestone-show' into 'master'Phil Hughes2018-01-102-1/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dashboard milestone show inside dispatcher See merge request gitlab-org/gitlab-ce!16304
| * | | | | | | | | | Refactor dashboard milestone show inside dispatcherClement Ho2018-01-102-1/+12
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'dispatcher-dashboard-milestone-index' into 'master'Phil Hughes2018-01-102-1/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dashboard milestone index inside dispatcher See merge request gitlab-org/gitlab-ce!16303
| * | | | | | | | | | 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
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'sh-fix-bare-import-hooks' into 'master'James Lopez2018-01-105-2/+38
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix hooks not being set up properly for bare import Rake task Closes #41739 See merge request gitlab-org/gitlab-ce!16280
| * | | | | | | | | | | Fix hooks not being set up properly for bare import Rake tasksh-fix-bare-import-hooksStan Hu2018-01-095-2/+38
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #41739
* | | | | | | | | | | Merge branch 'dz-improve-code-quality-docs' into 'master'Achilleas Pipinellis2018-01-101-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 0.69 version of codeclimate image for CI code quality docs See merge request gitlab-org/gitlab-ce!16319
| * | | | | | | | | | Use 0.69 version of codeclimate image for CI code quality docsdz-improve-code-quality-docsDmitriy Zaporozhets2018-01-091-1/+2
| | | | | | | | | | |
* | | | | | | | | | | Revert "Fix Route validation for unchanged path"Michael Kozono2018-01-092-61/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8040edcce8b4e736b4f4857e6709f94aeb5e274c.
* | | | | | | | | | | Revert "Add test for permanent redirects of descendants"Michael Kozono2018-01-091-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a2cb92495c3149b69eb734596e80fbdd54b0b2dc.
* | | | | | | | | | | Add test for permanent redirects of descendantsMichael Kozono2018-01-091-0/+14
| | | | | | | | | | |
* | | | | | | | | | | Fix Route validation for unchanged pathMichael Kozono2018-01-092-1/+61
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'fj-41477-fix-bug-wiki-last-version' into 'master'Douwe Maan2018-01-094-0/+91
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing bug related to wiki last version Closes #41477 and #41506 See merge request gitlab-org/gitlab-ce!16197
| * | | | | | | | | | Fixing bug related to wiki last versionFrancisco Javier López2018-01-094-0/+91
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'improve-ssh-lookup-docs' into 'master'Douwe Maan2018-01-092-28/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve SSH database key lookup documentation Closes #41399 See merge request gitlab-org/gitlab-ce!16048
| * | | | | | | | | | Use the new gitlab-shell authorized-keys helper in documentationNick Thomas2018-01-092-28/+6
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | 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-095-4/+25
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix changes dropdown ellipsis working across browsers Closes #41561 and #41684 See merge request gitlab-org/gitlab-ce!16281
| * | | | | | | | Fix changes dropdown ellipsis working across browserschanges-dropdown-ellipsisPhil Hughes2018-01-095-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #41561
* | | | | | | | | Merge branch 'master' into 'master'Achilleas Pipinellis2018-01-091-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix example in ci ssh_keys documentation See merge request gitlab-org/gitlab-ce!16079
| * | | | | | | | | fix example in ci ssh_keys documentationVincent Lae2017-12-211-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'docs-push-web-hook-note' into 'master'Achilleas Pipinellis2018-01-091-0/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note about only 20 commits being included in push payload See merge request gitlab-org/gitlab-ce!16149
| * | | | | | | | | | Add note about only 20 commits being included in push payloaddocs-push-web-hook-noteDrew Blessing2017-12-271-0/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'docs/rs-fix-changelog-header-level' into 'master'Achilleas Pipinellis2018-01-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the header level for the Changelog Arguments documentation See merge request gitlab-org/gitlab-ce!16158
| * | | | | | | | | | | Fix the header level for the Changelog Arguments documentationdocs/rs-fix-changelog-header-levelRobert Speicher2017-12-281-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'docs-19843-specify-archive-sha-options' into 'master'Achilleas Pipinellis2018-01-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifies the accepted refs for downloading an archive via the API Closes #19843 See merge request gitlab-org/gitlab-ce!16222
| * | | | | | | | | | | | Specifies the accepted refs for downloading an archive via the APIMark Fletcher2018-01-041-1/+1
| | | | | | | | | | | | |