summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add link to GDK autodevops guide to autodevops docealcantara-link-gdk-autodevops-guidesEnrique Alcántara2019-05-171-0/+4
* Add links to GDK autodevops and runner guides docs-ealcantara-link-gdk-autodevops-guidesEnrique Alcántara2019-05-171-0/+5
* Merge branch 'leipert-node-12-compatibility' into 'master'Phil Hughes2019-05-174-22/+25
|\
| * Merge branch '61629-dependency-installation-error-on-fsevents-1-2-4-with-node...leipert-node-12-compatibilityLukas Eipert2019-05-162-3/+8
| |\
| | * Update indirect dependency fsevents from 1.2.4 to 1.2.9Takuya Noguchi2019-05-092-3/+8
| * | Upgrade node-sass for node 12 compatibilityLukas Eipert2019-05-163-19/+17
* | | Merge branch 'dz-patch-58' into 'master'Annabel Dunstone Gray2019-05-172-1/+6
|\ \ \
| * | | Prefer Noto Sans over Oxygen-Sansdz-patch-58Dmitriy Zaporozhets2019-05-162-1/+6
| |/ /
* | | Merge branch 'dz-improve-ci-id-migration' into 'master'Sean McGivern2019-05-171-2/+7
|\ \ \
| * | | Add extra checks for ci_id migrationDmitriy Zaporozhets2019-05-171-2/+7
* | | | Merge branch 'winh-increase-jest-timeout' into 'master'Tim Zallmann2019-05-174-10/+1
|\ \ \ \ | |/ / / |/| | |
| * | | 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 PoolRepository to the usage pingZeger-Jan van de Weg2019-05-173-9/+26
|/ / /
* | | Merge branch '60379-remove-ci-preparing-state-feature-flag' into 'master'James Lopez2019-05-1711-128/+19
|\ \ \
| * | | Stop configuring group clusters on creation60379-remove-ci-preparing-state-feature-flagTiger2019-05-1611-128/+19
* | | | Merge branch 'edit-ci-template-file' into 'master'Grzegorz Bizon2019-05-171-41/+50
|\ \ \ \
| * | | | 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 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 settingsgroup-general-settings-scbLuke Bennett2019-05-162-11/+11
* | | | | | Merge branch 'admin-groups-form-scb' into 'master'Phil Hughes2019-05-171-1/+1
|\ \ \ \ \ \
| * | | | | | Resolve CE/EE diffs in admin groups formadmin-groups-form-scbLuke Bennett2019-05-161-1/+1
| |/ / / / /
* | | | | | Merge branch 'protected-branches-scb' into 'master'Phil Hughes2019-05-171-1/+1
|\ \ \ \ \ \
| * | | | | | Resolve CE/EE diffs in protected branchesprotected-branches-scbLuke Bennett2019-05-161-1/+1
* | | | | | | Merge branch '60550-make-application-data-plain-module' into 'master'Bob Van Landuyt2019-05-171-39/+35
|\ \ \ \ \ \ \
| * | | | | | | 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 snippetsStan Hu2019-05-164-31/+114
* | | | | | | | Merge branch 'docs-sso-enforcement-ce' into 'master'James Lopez2019-05-171-2/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | #46469 - Added ref querystring parameter to project search to allow searching...Lee Tickett2019-05-174-3/+17
|/ / / / / / / /
* | | | | | | | Merge branch 'update-haml-lint-spec-helpers' into 'master'Stan Hu2019-05-172-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 sizecleanup-assets-older-than-4-daysRémy Coutable2019-05-141-2/+2
* | | | | | | | | Merge branch 'docs-followup-27956' into 'master'Achilleas Pipinellis2019-05-170-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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' int...Achilleas Pipinellis2019-05-171-1/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Update extra CI minutes docsrd-add-additional-notes-for-extra-ci-minutes-purchase-docsRubén Dávila2019-05-151-1/+9
* | | | | | | | | | Merge branch 'docs-followup-28043' into 'master'Achilleas Pipinellis2019-05-173-9/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 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`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 CEAchilleas Pipinellis2019-05-161-2/+4
| | |_|_|_|/ / / / / | |/| | | | | | | |