Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'brendan-update-issue-templates' into 'master' | Achilleas Pipinellis | 2019-05-17 | 1 | -3/+3 |
|\ | |||||
| * | Issue template grammar improvements | Brendan O'Leary 🐢 | 2019-05-17 | 1 | -3/+3 |
|/ | |||||
* | Merge branch 'mk/improve-feature-flag-example' into 'master' | Achilleas Pipinellis | 2019-05-17 | 1 | -6/+5 |
|\ | |||||
| * | Don't undermine the point with biased logicmk/improve-feature-flag-example | Michael Kozono | 2019-02-28 | 1 | -6/+5 |
* | | Merge branch 'jl-add-pod-logs-to-k8s-docs' into 'master' | Achilleas Pipinellis | 2019-05-17 | 1 | -5/+6 |
|\ \ | |||||
| * | | Add pod logs to our cluster docs page | Joshua Lambert | 2019-05-17 | 1 | -5/+6 |
|/ / | |||||
* | | Merge branch 'patch-49' into 'master' | Achilleas Pipinellis | 2019-05-17 | 1 | -1/+5 |
|\ \ | |||||
| * | | Update index.md | Mohamed El-Feky | 2019-05-17 | 1 | -1/+5 |
|/ / | |||||
* | | Merge branch 'docs-environments-review-2' into 'master' | Achilleas Pipinellis | 2019-05-17 | 1 | -2/+2 |
|\ \ | |||||
| * | | Docs: Follow-Up on Environments doc review | Marcel Amirault | 2019-05-17 | 1 | -2/+2 |
|/ / | |||||
* | | Merge branch 'improve-wiki-custom-sidebar-docs' into 'master' | Achilleas Pipinellis | 2019-05-17 | 1 | -4/+6 |
|\ \ | |||||
| * | | Improved custom wiki sidebar docsimprove-wiki-custom-sidebar-docs | Andreas Kämmerle | 2019-05-02 | 1 | -4/+6 |
* | | | Merge branch 'docs/dependency-proxy-ce' into 'master' | Achilleas Pipinellis | 2019-05-17 | 4 | -0/+228 |
|\ \ \ | |||||
| * | | | Add documentation for dependency proxy feature | Dmitriy Zaporozhets | 2019-05-17 | 4 | -0/+228 |
|/ / / | |||||
* | | | Merge branch 'fix-too-many-loops-cron-error' into 'master' | Robert Speicher | 2019-05-17 | 4 | -5/+17 |
|\ \ \ | |||||
| * | | | add changelogfix-too-many-loops-cron-error | Fabio Pitino | 2019-05-07 | 1 | -0/+5 |
| * | | | Remove temporary workaround rescuing RuntimeError | Fabio Pitino | 2019-05-07 | 1 | -9/+1 |
| * | | | Merge branch 'fix-too-many-loops-cron-error' of https://gitlab.com/gitlab-org... | Fabio Pitino | 2019-05-07 | 1 | -1/+9 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'fix-too-many-loops-cron-error' of https://gitlab.com/gitlab-org... | Fabio Pitino | 2019-05-02 | 0 | -0/+0 |
| | |\ \ \ | |||||
| | | * | | | Rescue RuntimeError when "too many loops" are reached by Fugit::Cron | Fabio Pitino | 2019-05-02 | 1 | -1/+9 |
| | | * | | | Write test that exposes bug with Fugit gem | Fabio Pitino | 2019-04-30 | 1 | -0/+7 |
| | * | | | | Rescue RuntimeError when "too many loops" are reached by Fugit::Cron | Fabio Pitino | 2019-05-02 | 1 | -1/+9 |
| | * | | | | Write test that exposes bug with Fugit gem | Fabio Pitino | 2019-05-02 | 1 | -0/+7 |
| * | | | | | Remove workaround by upgrading Fugit gem | Fabio Pitino | 2019-05-07 | 4 | -21/+6 |
| * | | | | | Rescue RuntimeError when "too many loops" occur | Fabio Pitino | 2019-05-07 | 2 | -1/+16 |
| * | | | | | Write test that exposes bug with Fugit gem | Fabio Pitino | 2019-05-07 | 1 | -0/+7 |
* | | | | | | Merge branch '61376-add-documentation-about-how-to-enable-puma-web-server-for... | Achilleas Pipinellis | 2019-05-17 | 4 | -19/+113 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Replace Unicorn with web server in the init.d script [ci skip] | Dmitriy Zaporozhets | 2019-05-17 | 4 | -19/+113 |
|/ / / / / / | |||||
* | | | | | | Merge branch '237-style-toast-component' into 'master' | Clement Ho | 2019-05-17 | 3 | -2/+68 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Style toasts according to design specs | Jacques Erasmus | 2019-05-17 | 3 | -2/+68 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'visual-review-script' into 'master' | Fatih Acet | 2019-05-17 | 2 | -0/+627 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add new version of script | Sarah Groff Hennigh-Palermo | 2019-05-17 | 2 | -0/+627 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'mm12935' into 'master' | Jan Provaznik | 2019-05-17 | 2 | -1/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove Content-Type override for Mattermost OAuth login | Harrison Healey | 2019-05-16 | 2 | -1/+6 |
* | | | | | | | Merge branch 'leipert-node-12-compatibility' into 'master' | Phil Hughes | 2019-05-17 | 4 | -22/+25 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch '61629-dependency-installation-error-on-fsevents-1-2-4-with-node...leipert-node-12-compatibility | Lukas Eipert | 2019-05-16 | 2 | -3/+8 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Update indirect dependency fsevents from 1.2.4 to 1.2.9 | Takuya Noguchi | 2019-05-09 | 2 | -3/+8 |
| * | | | | | | | | Upgrade node-sass for node 12 compatibility | Lukas Eipert | 2019-05-16 | 3 | -19/+17 |
* | | | | | | | | | Merge branch 'dz-patch-58' into 'master' | Annabel Dunstone Gray | 2019-05-17 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Prefer Noto Sans over Oxygen-Sansdz-patch-58 | Dmitriy Zaporozhets | 2019-05-16 | 2 | -1/+6 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'dz-improve-ci-id-migration' into 'master' | Sean McGivern | 2019-05-17 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add extra checks for ci_id migration | Dmitriy Zaporozhets | 2019-05-17 | 1 | -2/+7 |
* | | | | | | | | | | Merge branch 'winh-increase-jest-timeout' into 'master' | Tim Zallmann | 2019-05-17 | 4 | -10/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Increase Jest timeout to 500ms | Winnie Hellmann | 2019-05-17 | 4 | -10/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'zj-usage-ping-pool-repository' into 'master' | James Lopez | 2019-05-17 | 3 | -9/+26 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add PoolRepository to the usage ping | Zeger-Jan van de Weg | 2019-05-17 | 3 | -9/+26 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch '60379-remove-ci-preparing-state-feature-flag' into 'master' | James Lopez | 2019-05-17 | 11 | -128/+19 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Stop configuring group clusters on creation60379-remove-ci-preparing-state-feature-flag | Tiger | 2019-05-16 | 11 | -128/+19 |
* | | | | | | | | | | Merge branch 'edit-ci-template-file' into 'master' | Grzegorz Bizon | 2019-05-17 | 1 | -41/+50 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Edit comments in CI template | Evan Read | 2019-05-17 | 1 | -41/+50 |
|/ / / / / / / / / / |