summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Resolve CE/EE diffs in admin users headadmin-users-head-scbLuke Bennett2019-05-171-0/+1
| | | | Part of single codebase changes.
* Merge branch 'dz-improve-ci-id-migration' into 'master'Sean McGivern2019-05-171-2/+7
|\ | | | | | | | | Add extra checks for ci_id migration See merge request gitlab-org/gitlab-ce!28404
| * Add extra checks for ci_id migrationDmitriy Zaporozhets2019-05-171-2/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'winh-increase-jest-timeout' into 'master'Tim Zallmann2019-05-174-10/+1
|\ \ | |/ |/| | | | | Increase Jest timeout to 500ms See merge request gitlab-org/gitlab-ce!28383
| * Increase Jest timeout to 500msWinnie Hellmann2019-05-174-10/+1
|/
* Merge branch 'zj-usage-ping-pool-repository' into 'master'James Lopez2019-05-173-9/+26
|\ | | | | | | | | Add Pool repository to the usage ping See merge request gitlab-org/gitlab-ce!28267
| * Add PoolRepository to the usage pingZeger-Jan van de Weg2019-05-173-9/+26
|/ | | | | | PoolRepository is a relatively new model of which the counts could help to further determine the priority of new features. Also gives some insight into the number of forks customers have.
* Merge branch '60379-remove-ci-preparing-state-feature-flag' into 'master'James Lopez2019-05-1711-128/+19
|\ | | | | | | | | | | | | Stop configuring group clusters on creation Closes #60379 See merge request gitlab-org/gitlab-ce!27245
| * Stop configuring group clusters on creation60379-remove-ci-preparing-state-feature-flagTiger2019-05-1611-128/+19
| | | | | | | | | | | | | | | | | | | | | | Immediate configuration is not ideal for group and instance level clusters as projects that may never be deployed would still have Kubernetes namespaces and service accounts created for them. As of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25586 we now create only the resources that are required for the project being deployed, at the time of deployment.
* | Merge branch 'edit-ci-template-file' into 'master'Grzegorz Bizon2019-05-171-41/+50
|\ \ | | | | | | | | | | | | Edit comments in CI template See merge request gitlab-org/gitlab-ce!28342
| * | Edit comments in CI templateEvan Read2019-05-171-41/+50
|/ /
* | Merge branch 'bw-unicorn-extra-line' into 'master'Grzegorz Bizon2019-05-171-1/+0
|\ \ | | | | | | | | | | | | Remove extra ending line from unicorn example file See merge request gitlab-org/gitlab-ce!28388
| * | Remove extra ending line from unicorn example filebw-unicorn-extra-lineBrett Walker2019-05-161-1/+0
| | |
* | | Merge branch 'group-general-settings-scb' into 'master'Phil Hughes2019-05-172-11/+11
|\ \ \ | | | | | | | | | | | | | | | | Resolve CE/EE diffs in group general settings See merge request gitlab-org/gitlab-ce!28363
| * | | Resolve CE/EE diffs in group general settingsgroup-general-settings-scbLuke Bennett2019-05-162-11/+11
| | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | Merge branch 'admin-groups-form-scb' into 'master'Phil Hughes2019-05-171-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in admin groups form Closes gitlab-ee#11042 See merge request gitlab-org/gitlab-ce!28365
| * | | | Resolve CE/EE diffs in admin groups formadmin-groups-form-scbLuke Bennett2019-05-161-1/+1
| |/ / / | | | | | | | | | | | | Part of single codebase changes.
* | | | Merge branch 'protected-branches-scb' into 'master'Phil Hughes2019-05-171-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in protected branches Closes gitlab-ee#11034 See merge request gitlab-org/gitlab-ce!28362
| * | | | Resolve CE/EE diffs in protected branchesprotected-branches-scbLuke Bennett2019-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | | Merge branch '60550-make-application-data-plain-module' into 'master'Bob Van Landuyt2019-05-171-39/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make ApplicationData a plain module include Closes #60550 See merge request gitlab-org/gitlab-ce!28387
| * | | | | Make ApplicationData a plain module include60550-make-application-data-plain-moduleDylan Griffith2019-05-161-39/+35
| | |_|/ / | |/| | |
* | | | | Merge branch 'sh-fix-personal-snippet-uploads-object-storage' into 'master'Sean McGivern2019-05-174-31/+114
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect prefix used in new uploads for personal snippets Closes #61671 See merge request gitlab-org/gitlab-ce!28337
| * | | | | Fix incorrect prefix used in new uploads for personal snippetsStan Hu2019-05-164-31/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24550 fixed the case where the wrong path on disk was being searched, but it inadvertently ommitted the `/uploads/-/system` prefix when rendering the Markdown for personal snippet uploads when they were stored directly in object storage. A personal snippet path is stored using FileUploader#upload_path. The format for the path: Local storage: :random_hex/:filename. Object storage: personal_snippet/:id/:random_hex/:filename. upload_paths represent the possible paths for a given identifier, which will vary depending on whether the file is stored in local or object storage. upload_path should match an element in upload_paths. base_dir represents the path seen by the user in Markdown, and it should always be prefixed with uploads/-/system. store_dirs represent the paths that are actually used on disk. For object storage, this should omit the prefix /uploads/-/system. For example, consider the requested path /uploads/-/system/personal_snippet/172/ff4ad5c2/file.png. For local storage: base_dir: uploads/-/system/personal_snippet/172 upload_path: ff4ad5c2/file.png upload_paths: ["ff4ad5c2/file.png", "personal_snippet/172/ff4ad5c2/file.png"]. store_dirs: {1=>"uploads/-/system/personal_snippet/172/ff4ad5c2", 2=>"personal_snippet/172/ff4ad5c2"} For object storage: upload_path: personal_snippet/172/ff4ad5c2/file.png Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61671
* | | | | | Merge branch 'docs-sso-enforcement-ce' into 'master'James Lopez2019-05-171-2/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSO enforcement docs details added from 11.11 See merge request gitlab-org/gitlab-ce!28394
| * | | | | | SSO enforcement docs details added from 11.11Jeremy Watson2019-05-171-2/+10
|/ / / / / /
* | | | | | Merge branch 'patch-54' into 'master'Lin Jen-Shin2019-05-174-3/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ref (branch/tag) parameter to project search API See merge request gitlab-org/gitlab-ce!28069
| * | | | | | #46469 - Added ref querystring parameter to project search to allow ↵Lee Tickett2019-05-174-3/+17
|/ / / / / / | | | | | | | | | | | | | | | | | | searching on branches other than master
* | | | | | Merge branch 'update-haml-lint-spec-helpers' into 'master'Stan Hu2019-05-172-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update haml_lint to include linter spec helpers Closes #61892 See merge request gitlab-org/gitlab-ce!28379
| * | | | | | Update haml_lint to include linter spec helpersupdate-haml-lint-spec-helpersLuke Bennett2019-05-162-3/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'cleanup-assets-older-than-4-days' into 'master'Ash McKenzie2019-05-171-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up assets that are older than 4 days to reduce assets cache size See merge request gitlab-org/gitlab-ce!28318
| * | | | | | Clean up assets that are older than 4 days to reduce assets cache sizecleanup-assets-older-than-4-daysRémy Coutable2019-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'docs-followup-27956' into 'master'Achilleas Pipinellis2019-05-170-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Update links and add badge to examples readme Closes #61439 See merge request gitlab-org/gitlab-ce!28349
| * | | | | | | Update links and add badge to examples readmeMarcel Amirault2019-05-161-24/+24
| | | | | | | |
* | | | | | | | Merge branch 'rd-add-additional-notes-for-extra-ci-minutes-purchase-docs' ↵Achilleas Pipinellis2019-05-171-1/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Update CI minutes docs regarding transferring of minutes and billing See merge request gitlab-org/gitlab-ce!28293
| * | | | | | | Update extra CI minutes docsrd-add-additional-notes-for-extra-ci-minutes-purchase-docsRubén Dávila2019-05-151-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply suggestion to continuous_integration.md
* | | | | | | | Merge branch 'docs-followup-28043' into 'master'Achilleas Pipinellis2019-05-173-9/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Add badges and fix redirect style in 3 docs Closes #61440 See merge request gitlab-org/gitlab-ce!28350
| * | | | | | | | Docs: Add badges and fix redirect style in 3 docsMarcel Amirault2019-05-173-9/+7
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-followup-27956' into 'master'Achilleas Pipinellis2019-05-171-24/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Update links and add badge to examples readme Closes #61439 See merge request gitlab-org/gitlab-ce!28349
| * | | | | | | | Docs: Update links and add badge to examples readmeMarcel Amirault2019-05-171-24/+24
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-followup-27943' into 'master'Achilleas Pipinellis2019-05-1715-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Delete orphaned images in `merge_requests/img` Closes #61438 See merge request gitlab-org/gitlab-ce!28346
| * | | | | | | | Docs: Delete orphaned images in `merge_requests/img`Marcel Amirault2019-05-1715-0/+0
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/single-docs-resync' into 'master'Evan Read2019-05-171-2/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resync the docs that were submitted to EE instead of CE See merge request gitlab-org/gitlab-ce!28389
| * | | | | | | | Resync the docs that were submitted to EE instead of CEAchilleas Pipinellis2019-05-161-2/+4
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch '61914-fix-emojis-urls' into 'master'Achilleas Pipinellis2019-05-172-5/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix emojis URLs Closes #61914 See merge request gitlab-org/gitlab-ce!28371
| * | | | | | | | Fix emojis URLsPaul Gascou-Vaillancourt2019-05-172-5/+10
|/ / / / / / / /
* | | | | | | | Merge branch 'jl-add-component-subheadings-docs' into 'master'Achilleas Pipinellis2019-05-171-3/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add subheadings to components page See merge request gitlab-org/gitlab-ce!28382
| * | | | | | | | Add subheadings to components in architecture pagejl-add-component-subheadings-docsJoshua Lambert2019-05-161-3/+7
| | | | | | | | |
* | | | | | | | | Merge branch 'docs/force-auth-mr-12-0' into 'master'Evan Read2019-05-161-0/+12
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix docs intro version for force auth for approvers See merge request gitlab-org/gitlab-ce!28390
| * | | | | | | | Fix docs intro version for force auth for approversAchilleas Pipinellis2019-05-161-0/+12
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This feature was introduced in 12.0, not in 11.11.
* | | | | | | | Merge branch 'fe-use-process-timer-in-jest-timeout' into 'master'Fatih Acet2019-05-161-10/+17
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Use process timer for jest timeout testing See merge request gitlab-org/gitlab-ce!28209
View Lorry Controller Status