summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove a useless `allow_failure: no` and use `true` instead of `yes`rc/remove-useless-allow-failureRémy Coutable2017-11-201-2/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'qa/gb/add-docker-to-qa-image' into 'master'Rémy Coutable2017-11-201-0/+7
|\ | | | | | | | | Add Docker binaries to instance image of GitLab QA See merge request gitlab-org/gitlab-ce!15489
| * Add Docker binaries to instance image of GitLab QAGrzegorz Bizon2017-11-201-0/+7
| |
* | Merge branch 'gitaly-delete-refs' into 'master'Douwe Maan2017-11-207-5/+59
|\ \ | | | | | | | | | | | | | | | | | | Incorporate Gitaly's RefService.DeleteRefs RPC Closes gitaly#740 See merge request gitlab-org/gitlab-ce!15460
| * | Incorporate Gitaly's RefService.DeleteRefs RPCgitaly-delete-refsAlejandro Rodríguez2017-11-177-5/+59
| | |
* | | Merge branch '38451-fe-sprite-icons-vue-component' into 'master'Annabel Dunstone Gray2017-11-202-9/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Icons Documentation about Icon Vue Component Closes #38451 See merge request gitlab-org/gitlab-ce!15171
| * | | Added info about tracking38451-fe-sprite-icons-vue-componentTim Zallmann2017-11-161-1/+1
| | | |
| * | | Added + Updated Document for Vue ComponentTim Zallmann2017-11-162-8/+27
| | | |
* | | | Merge branch 'osw-merge-process-logs' into 'master'Sean McGivern2017-11-202-0/+17
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Add logs for monitoring the merge process See merge request gitlab-org/gitlab-ce!15425
| * | | Add MR reference to logsOswaldo Ferreira2017-11-201-5/+5
| | | |
| * | | Add logs for monitoring the merge processosw-merge-process-logsOswaldo Ferreira2017-11-162-0/+17
| | | |
* | | | Merge branch 'bvl-dont-move-projects-using-hashed-storage' into 'master'Douwe Maan2017-11-204-3/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't move project repository/attachments when using hashed storage Closes #40289 See merge request gitlab-org/gitlab-ce!15479
| * | | | Don't move project repository/attachments when using hashed storageBob Van Landuyt2017-11-204-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project is using hashed storage, the repositories and attachments wouldn't be saved on disk using the `full_path`. So the migration would not do anything. However: best to just skip moving when hashed storage is enabled.
* | | | | Merge branch 'merge-requests-schema-cleanup' into 'master'Sean McGivern2017-11-2011-5/+276
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up schema of the "merge_requests" table Closes #31825 See merge request gitlab-org/gitlab-ce!15377
| * | | | | Clean up schema of the "merge_requests" tableYorick Peterse2017-11-2011-5/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds various foreign keys and indexes to the "merge_requests" table as outlined in https://gitlab.com/gitlab-org/gitlab-ce/issues/31825. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/31825
* | | | | | Merge branch '40335-master-is-broken-due-to-static-analysis' into 'master'Sean McGivern2017-11-201-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "`master` is broken due to `static-analysis`" Closes #40335 See merge request gitlab-org/gitlab-ce!15481
| * | | | | | Fix offense to the LineBreakAfterGuardClauses cop40335-master-is-broken-due-to-static-analysisRémy Coutable2017-11-201-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'docs/gb/update-pipeline-badge-docs' into 'master'Rémy Coutable2017-11-202-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update pipeline status badge details docs Closes #40316 See merge request gitlab-org/gitlab-ce!15483
| * | | | | | Update pipeline status badge details docsdocs/gb/update-pipeline-badge-docsGrzegorz Bizon2017-11-202-2/+4
| |/ / / / /
* | | | | | Merge branch 'docs/use-slug-as-prefix-in-ci-docs-job' into 'master'Rémy Coutable2017-11-202-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use slug as the prefix for the docs CI job preview URL See merge request gitlab-org/gitlab-ce!15450
| * | | | | | Use slug as the prefix for the docs CI job preview URLdocs/use-slug-as-prefix-in-ci-docs-jobAchilleas Pipinellis2017-11-172-2/+2
| | | | | | |
* | | | | | | Merge branch '38393-Milestone-duration-error-message-is-not-accurate-enough' ↵Sean McGivern2017-11-203-2/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Changed validation error message on wrong milestone dates Closes #38393 See merge request gitlab-org/gitlab-ce!15471
| * | | | | | | Changed validation error message on wrong milestone datesXurxo Méndez Pérez2017-11-183-2/+7
| | | | | | | |
* | | | | | | | Merge branch 'patch-9' into 'master'Sean McGivern2017-11-201-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | doc: schedules.md: fix only-and-except anchor link See merge request gitlab-org/gitlab-ce!15473
| * | | | | | | schedules.md: fix only-and-except anchor linkElan Ruusamäe2017-11-191-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'fix-conflict-highlighting' into 'master'Douwe Maan2017-11-203-4/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix conflict highlighting See merge request gitlab-org/gitlab-ce!15463
| * | | | | | | Fix conflict highlightingfix-conflict-highlightingSean McGivern2017-11-173-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts used to take a `Repository` and pass that to `Gitlab::Highlight.highlight`, which would call `#gitattribute` on the repository. Now they use a `Gitlab::Git::Repository`, which didn't have that method defined - but defining it on `Gitlab::Git::Repository` does make it available on `Repository` through `method_missing`, so we can do that and both cases will work.
* | | | | | | | Merge branch '39727-axios-all-the-things' into 'master'Phil Hughes2017-11-2012-162/+128
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use axios instead of vue resource - step 1 See merge request gitlab-org/gitlab-ce!15339
| * | | | | | | | Use axios instead of vue resource - step 1Filipa Lacerda2017-11-2012-162/+128
|/ / / / / / / /
* | | | | | | | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-20113-0/+410
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds Rubocop rule for line break after guard clause Closes #18040 See merge request gitlab-org/gitlab-ce!15188
| * | | | | | | | Adds Rubocop rule for line break after guard clauseJacopo2017-11-16113-0/+410
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
* | | | | | | | | Merge branch 'docs/fix-broken-anchor' into 'master'Achilleas Pipinellis2017-11-202-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a wrong anchor to job permissions doc See merge request gitlab-org/gitlab-ce!15478
| * | | | | | | | | Fix a wrong anchor to job permissions docdocs/fix-broken-anchorRémy Coutable2017-11-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch '40016-log-header' into 'master'Phil Hughes2017-11-203-8/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide log size in mobile Closes #40016 See merge request gitlab-org/gitlab-ce!15431
| * | | | | | | | | | Hide log size in mobileFilipa Lacerda2017-11-203-8/+14
|/ / / / / / / / / /
* | | | | | | | | | Merge branch ↵Rémy Coutable2017-11-202-7/+20
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use' into 'master' Fix Gitlab::Git::Repository#remote_tags using unexisting variable Closes #40300 See merge request gitlab-org/gitlab-ce!15466
| * | | | | | | | | Fix Gitlab::Git::Repository#remote_tags using unexisting variableAlejandro Rodríguez2017-11-202-7/+20
|/ / / / / / / / /
* | | | | | | | | Merge branch 'sh-document-strace-unicorn' into 'master'Achilleas Pipinellis2017-11-201-0/+28
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Document how to troubleshoot internal API calls See merge request gitlab-org/gitlab-ce!15337
| * | | | | | | | Document how to troubleshoot internal API callsStan Hu2017-11-181-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] iFoo
* | | | | | | | | Merge branch 'rs-cycle-analytics-seed' into 'master'Rémy Coutable2017-11-201-37/+48
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CycleAnalytics seed to account for multiple issue assignees Closes #40245 See merge request gitlab-org/gitlab-ce!15435
| * | | | | | | | Update CycleAnalytics seed to account for multiple issue assigneesrs-cycle-analytics-seedRobert Speicher2017-11-161-37/+48
| | | | | | | | |
* | | | | | | | | Merge branch 'sh-remove-docs-executable' into 'master'Achilleas Pipinellis2017-11-184-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove executable bit from images for docs lint See merge request gitlab-org/gitlab-ce!15468
| * | | | | | | | | Remove executable bit from images for docs lintsh-remove-docs-executableStan Hu2017-11-174-0/+0
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | This was causing a docs lint failure in https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/40901316.
* | | | | | | | | Merge branch 'docs-link-subgroups-api-mr' into 'master'Achilleas Pipinellis2017-11-181-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document when Groups API `/subgroups` endpoint introduced Closes #40247 See merge request gitlab-org/gitlab-ce!15453
| * | | | | | | | Document when Groups API `/subgroups` endpoint introducedMark Fletcher2017-11-171-0/+4
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'mk-bandaid-db-rollback-failures' into 'master'Robert Speicher2017-11-171-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rollback to a safer place to stop See merge request gitlab-org/gitlab-ce!15465
| * | | | | | | | Rollback to a safer place to stopMichael Kozono2017-11-171-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch '4056-hashed-storage-upload-transfers' into 'master'Stan Hu2017-11-171-1/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project transfer with hashed-storage attachments Closes gitlab-ee#4056 See merge request gitlab-org/gitlab-ce!15457
| * | | | | | | | Fix project transfer with hashed-storage attachmentsNick Thomas2017-11-171-1/+11
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'restrict-update-column-in-batches-for-large-tables' into 'master'Robert Speicher2017-11-1731-67/+153
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict update column in batches for large tables See merge request gitlab-org/gitlab-ce!15458