summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '549-support-multiple-gdk-run-args' into 'master'docs-gitaly-secrets-mismatchToon Claes2019-07-185-24/+69
|\
| * Support `gdk run` with multiple argsAsh McKenzie2019-07-185-24/+69
* | Merge branch 'ashmckenzie/ci-improvements' into 'master'Stan Hu2019-07-184-60/+103
|\ \ | |/ |/|
| * Use shallow_clone with gdk installingAsh McKenzie2019-07-171-1/+1
| * Move CI install/update logic into support/ci/xxxAsh McKenzie2019-07-174-36/+77
| * Hit a URL that will properly test the stackAsh McKenzie2019-07-171-2/+2
| * Add explicit stage: testAsh McKenzie2019-07-171-24/+26
|/
* Merge branch 'exiftool-homebrew' into 'master'Ash McKenzie2019-07-171-1/+1
|\
| * Install exiftool with OSX Homebrew Rene Verschoor2019-07-161-1/+1
* | Merge branch 'remove-references-to-node-lts' into 'master'Ash McKenzie2019-07-161-2/+2
|\ \ | |/ |/|
| * Remove reference to node 10.x LTSGiorgenes Gelatti2019-07-161-2/+2
* | Merge branch 'zj-rakefile-gitaly' into 'master'Toon Claes2019-07-1611-75/+209
|\ \
| * | Move Gitaly config to Rake tasksZeger-Jan van de Weg2019-07-1611-75/+209
* | | Merge branch 'mention-nip-for-autodevops-configuration' into 'master'Grzegorz Bizon2019-07-161-0/+4
|\ \ \ | |_|/ |/| |
| * | Apply suggestion to doc/howto/auto_devops/tips_and_troubleshooting.mdJoão Cunha2019-07-151-1/+1
| * | Mention nip.io For AutoDevOps TestingAndrew Fontaine2019-07-151-0/+4
* | | Merge branch 'sh-install-latest-git' into 'master'Ash McKenzie2019-07-162-2/+3
|\ \ \
| * | | Combine Git command-line install into one layerStan Hu2019-07-152-3/+3
| * | | Install latest version of GitStan Hu2019-07-151-0/+1
|/ / /
* | | Merge branch 'pin-icu4c' into 'master'Ash McKenzie2019-07-141-1/+2
|\ \ \ | |/ / |/| |
| * | Remove unnecessary pinAvielle Wolfe2019-07-111-1/+1
| * | Apply suggestion to doc/prepare.mdAvielle Wolfe2019-07-111-1/+1
| * | Pin icu4c and readlineAvielle Wolfe2019-07-111-2/+3
* | | Merge branch 'master' into 'master'Toon Claes2019-07-121-2/+25
|\ \ \
| * | | Fix script to handle both gitlab-ce *and* gitlab-ee.Evan Carlin2019-07-121-2/+25
|/ / /
* | | Merge branch 'update-gdk-doc-for-enable-puma-by-default' into 'master'Grzegorz Bizon2019-07-127-7/+28
|\ \ \ | |/ / |/| |
| * | Update GDK doc for enable puma by defaultQingyu Zhao2019-07-097-7/+28
* | | Merge branch 'fix/auto-devops-procfile-tunnels' into 'master'Toon Claes2019-07-091-2/+2
|\ \ \ | |/ / |/| |
| * | Make use of gdk config to populate auto devops portsJoão Cunha2019-07-091-2/+2
|/ /
* | Merge branch '543-add-puma-into-gdk-diff-config-files' into 'master'Toon Claes2019-07-081-0/+1
|\ \
| * | Add puma.rb into gdk diff-config filesQingyu Zhao2019-07-051-0/+1
| |/
* | Merge branch 'patch-3' into 'master'Toon Claes2019-07-081-0/+6
|\ \ | |/ |/|
| * Add gpgme issue to troubleshooting.mdAmmar Alakkad2019-07-081-0/+6
|/
* Merge branch 'fix-erb-renderer-on-linux' into 'master'Toon Claes2019-07-041-1/+2
|\
| * Update lib/gdk/erb_renderer.rbNick Thomas2019-07-041-1/+2
|/
* Merge branch 'tc-gdk-yml-config' into 'master'Stan Hu2019-07-0412-70/+575
|\
| * Apply suggestion to nginx/conf/nginx.conf.erbStan Hu2019-07-041-1/+1
| * Small tweaks in gdk.example.yml generationToon Claes2019-07-034-49/+67
| * More fine-grained nginx configToon Claes2019-07-033-9/+23
| * Dump settings from RakefileToon Claes2019-07-033-15/+118
| * Implement respond_to_missing?Toon Claes2019-07-011-5/+17
| * Don't use colors if not supportedToon Claes2019-07-011-1/+9
| * Safe-guard non-existence or emptiness of gdk.ymlToon Claes2019-07-011-3/+3
| * Remove unused files and gdk-defaults.yml.erbToon Claes2019-07-014-186/+1
| * Make the instructions more prominentToon Claes2019-07-011-5/+4
| * Convert defaults file into ruby codeToon Claes2019-07-014-24/+212
| * More Auto DevOps tweaksToon Claes2019-07-013-13/+26
| * Safe render ERB filesToon Claes2019-07-016-12/+63
| * Support auto_devops in Procfile.erbToon Claes2019-07-013-1/+20
| * The defaults reads the old-style files nowToon Claes2019-07-017-75/+38