summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'mk/improve-feature-flag-example' into 'master'Achilleas Pipinellis2019-05-171-6/+5
|\ \ \ \ \ \ \
| * | | | | | | Don't undermine the point with biased logicmk/improve-feature-flag-exampleMichael Kozono2019-02-281-6/+5
* | | | | | | | Merge branch 'jl-add-pod-logs-to-k8s-docs' into 'master'Achilleas Pipinellis2019-05-171-5/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add pod logs to our cluster docs pageJoshua Lambert2019-05-171-5/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-49' into 'master'Achilleas Pipinellis2019-05-171-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Update index.mdMohamed El-Feky2019-05-171-1/+5
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-environments-review-2' into 'master'Achilleas Pipinellis2019-05-171-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Docs: Follow-Up on Environments doc reviewMarcel Amirault2019-05-171-2/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'improve-wiki-custom-sidebar-docs' into 'master'Achilleas Pipinellis2019-05-171-4/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Improved custom wiki sidebar docsimprove-wiki-custom-sidebar-docsAndreas Kämmerle2019-05-021-4/+6
* | | | | | | | | Merge branch 'docs/dependency-proxy-ce' into 'master'Achilleas Pipinellis2019-05-174-0/+228
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add documentation for dependency proxy featureDmitriy Zaporozhets2019-05-174-0/+228
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fix-too-many-loops-cron-error' into 'master'Robert Speicher2019-05-174-5/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add changelogfix-too-many-loops-cron-errorFabio Pitino2019-05-071-0/+5
| * | | | | | | | | Remove temporary workaround rescuing RuntimeErrorFabio Pitino2019-05-071-9/+1
| * | | | | | | | | Merge branch 'fix-too-many-loops-cron-error' of https://gitlab.com/gitlab-org...Fabio Pitino2019-05-071-1/+9
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'fix-too-many-loops-cron-error' of https://gitlab.com/gitlab-org...Fabio Pitino2019-05-020-0/+0
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Rescue RuntimeError when "too many loops" are reached by Fugit::CronFabio Pitino2019-05-021-1/+9
| | | * | | | | | | | | Write test that exposes bug with Fugit gemFabio Pitino2019-04-301-0/+7
| | * | | | | | | | | | Rescue RuntimeError when "too many loops" are reached by Fugit::CronFabio Pitino2019-05-021-1/+9
| | * | | | | | | | | | Write test that exposes bug with Fugit gemFabio Pitino2019-05-021-0/+7
| * | | | | | | | | | | Remove workaround by upgrading Fugit gemFabio Pitino2019-05-074-21/+6
| * | | | | | | | | | | Rescue RuntimeError when "too many loops" occurFabio Pitino2019-05-072-1/+16
| * | | | | | | | | | | Write test that exposes bug with Fugit gemFabio Pitino2019-05-071-0/+7
* | | | | | | | | | | | Merge branch '61376-add-documentation-about-how-to-enable-puma-web-server-for...Achilleas Pipinellis2019-05-174-19/+113
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Replace Unicorn with web server in the init.d script [ci skip]Dmitriy Zaporozhets2019-05-174-19/+113
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch '237-style-toast-component' into 'master'Clement Ho2019-05-173-2/+68
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Style toasts according to design specsJacques Erasmus2019-05-173-2/+68
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'visual-review-script' into 'master'Fatih Acet2019-05-172-0/+627
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add new version of scriptSarah Groff Hennigh-Palermo2019-05-172-0/+627
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'mm12935' into 'master'Jan Provaznik2019-05-172-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove Content-Type override for Mattermost OAuth loginHarrison Healey2019-05-162-1/+6
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | 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