summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Tidy up main JS filemain-js-tidy-upPhil Hughes2018-01-1049-140/+145
|
* 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
| | | | | | | | |
* | | | | | | | | Merge branch 'patch-24' into 'master'Achilleas Pipinellis2018-01-091-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update irker documentation to mention an irker bug with key-protected channels. See merge request gitlab-org/gitlab-ce!16274
| * | | | | | | | | Update irker documentation to mention an irker bug with key-protected channels.Mattia Rizzolo2018-01-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mattia Rizzolo <mattia@debian.org>
* | | | | | | | | | Merge branch 'fj-41681-add-param-disable-commit-stats-api' into 'master'Douwe Maan2018-01-097-3/+63
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to disable commit stats to commit API Closes #41681 See merge request gitlab-org/gitlab-ce!16309
| * | | | | | | | | | Add option to disable commit stats to commit APIFrancisco Javier López2018-01-097-3/+63
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'doc-development-architecture.md-remove-unnecessary-line' into ↵Achilleas Pipinellis2018-01-091-2/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix: remove unnecessary line Closes #41501 See merge request gitlab-org/gitlab-ce!16289
| * | | | | | | | | | Fix: remove unnecessary lineOnuwa Nnachi Isaac2018-01-081-2/+0
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'Douwe Maan2018-01-0918-14/+749
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport authorized_keys Closes gitlab-ee#3953 See merge request gitlab-org/gitlab-ce!16014
| * | | | | | | | | | | Adds changelog for backport of authorized_keys DB lookup from EEjej/backport-authorized-keys-to-ceJames Edwards-Jones2018-01-081-0/+5
| | | | | | | | | | | |
View Lorry Controller Status