ushahidi · dukedanny · Jul 17, 2026 · Jul 13, 2026 · Jul 17, 2026
diff --git a/.arcconfig b/.arcconfig
diff --git a/.arclint b/.arclint
diff --git a/.coveralls.yml b/.coveralls.yml
diff --git a/.dockerignore b/.dockerignore
@@ -1,7 +1,4 @@
 Makefile
-codeship-*.yml
-deployment.env
-deployment.env.encrypted
 storage/app/public/**
 storage/app/temp/**
 storage/framework/cache/**
@@ -10,8 +7,11 @@ storage/framework/views/**
 storage/logs/**
 storage/passport/**
 
-# garden.io
-.garden
-garden_modules
-garden.yaml
+# Leftover deployment secrets. The tooling that produced these is gone, but old
+# working copies may still have them -- never let them into the build context.
+*.aes
+deployment.env
+docker.env
+vault.txt
+
 error.log
diff --git a/.editorconfig b/.editorconfig
@@ -2,7 +2,7 @@
 root = true
 
 [*]
-indent_style = spaces
+indent_style = space
 indent_size = 4
 end_of_line = lf
 charset = utf-8

diff --git a/.env.travis b/.env.travis
diff --git a/.gitignore b/.gitignore
@@ -9,57 +9,34 @@ vendor/*
 bin/*
 !bin/tests
 .vagrant/*
-.floo
-.flooignore
-.sublime-project
 build/*
-puppet/modules
-Puppetfile.lock
 .tmp/*
+tmp/
 *.vscode
 .env
+bootstrap/gwcheck.enabled
+
+# Local configs generated from the tracked .dist templates (see docker/utils.sh)
 phpunit.xml
 phpspec.yml
-phinx.yml
-bootstrap/gwcheck.enabled
+behat.yml
+
 # Homestead / Laravel files
 Homestead.json
 Homestead.yaml
 
-# Kohana deployment specifics
-application/logs/*
-application/cache/*
-application/config/environments/development/*.php
-
-# Kohana tests
-behat.yml
-application/tests/behat.yml
-
-# Kohana app uploads
-application/media/uploads/*
-
-# Kohana modules installed composer
-system
-modules/cache
-modules/image
-modules/unittest
-modules/minion
-modules/orm
-
-# Docker Deployment Specifics
+# Leftover deployment secrets. The tooling that produced these is gone, but the
+# files may still exist in old working copies -- keep ignoring them so they can
+# never be committed by accident. Delete your local copies.
 *.aes
 deployment.env
 docker.env
 vault.txt
 
-# garden.io
-.garden
-error.log
-# Snowboard
+# Snowboard (composer snowboard-v3-serve / snowboard-v5-serve)
 dist/*
 
-# Garden
-.garden
+error.log
 
 # Test Coverage
 coverage

diff --git a/.librarian/puppet/config b/.librarian/puppet/config
diff --git a/.travis.yml b/.travis.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,12 +1,12 @@
 ## Getting Involved
-There are many ways to get involved with Ushahidi projects, and some of them are great even for first time contributors. If you never contributed to Open Source Software before, or need more guidance doing it, please jump in our [gitter](https://gitter.im/ushahidi/Community) channel with a clear description of what you are trying to do, and someone in there will try to help you.
+There are many ways to get involved with Ushahidi projects, and some of them are great even for first time contributors. If you never contributed to Open Source Software before, or need more guidance doing it, please [open an issue](https://github.com/ushahidi/platform/issues) with a clear description of what you are trying to do, and someone will try to help you.
 
 ### You can contribute to Ushahidi projects in these areas:
 
 - **Documentation**: if you find an area of the Ushahidi platform that could use better docs, we would love to hear from you in an issue, and would be seriously excited if you send a [Pull Request](https://github.com/ushahidi/platform/compare). This is a great way to get involved if you are passionate about making information more available and clear to everyone.
 - **Report a bug**: If you found an issue/bug, please report it [here](https://github.com/ushahidi/platform/issues). Someone on the team will jump in to check it, try to help, and prioritize it for future development depending on the issue type. Please follow the bug report template to allow others to reproduce it easily. 
 - **Fix a bug**: If you want to contribute a fix for a bug you or someone else found, we will be happy to review your PR and provide support. Tasks that are suggested for the community can be found by searching for the https://github.com/ushahidi/platform/labels/Community%20Task tag. Please add a comment notifying others that you will be working on a task before you start.
 - **Helping other users in the community**: you are welcome and encouraged to jump in and help other members of the community, either by responding to issues in github or jumping into our community channels to answer questions. 
-- **New features**: our features are generally driven by our product and engineering team members, but if you have a great idea, or found a user need that we have not covered, you are more than welcome to make a suggestion in the form of a github issue [here](https://github.com/ushahidi/platform/issues), or reach out to Ushahidi staff in [gitter](https://gitter.im/ushahidi/Community)
+- **New features**: our features are generally driven by our product and engineering team members, but if you have a great idea, or found a user need that we have not covered, you are more than welcome to make a suggestion in the form of a github issue [here](https://github.com/ushahidi/platform/issues), or reach out to Ushahidi staff through [support](https://www.ushahidi.com/support)
 - **Security issues**: if you think you have found a security issue, please follow 
 [this link where we explain our disclosure and reporting policies](https://www.ushahidi.com/security)
diff --git a/Procfile b/Procfile
diff --git a/Vagrantfile b/Vagrantfile
@@ -7,8 +7,12 @@ require 'yaml'
 VAGRANTFILE_API_VERSION ||= "2"
 confDir = $confDir ||= File.expand_path("vendor/laravel/homestead", File.dirname(__FILE__))
 
+# Homestead.yml is the settings file that ships with the repo. Homestead.yaml /
+# Homestead.json are gitignored, so a developer can drop one in to override it
+# locally; those take precedence.
 homesteadYamlPath = File.expand_path("Homestead.yaml", File.dirname(__FILE__))
 homesteadJsonPath = File.expand_path("Homestead.json", File.dirname(__FILE__))
+homesteadYmlPath = File.expand_path("Homestead.yml", File.dirname(__FILE__))
 afterScriptPath = "after.sh"
 aliasesPath = "aliases"
 
@@ -28,8 +32,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         settings = YAML::load(File.read(homesteadYamlPath))
     elsif File.exist? homesteadJsonPath then
         settings = JSON.parse(File.read(homesteadJsonPath))
+    elsif File.exist? homesteadYmlPath then
+        settings = YAML::load(File.read(homesteadYmlPath))
     else
-        abort "Homestead settings file not found in #{confDir}"
+        abort "Homestead settings file not found in #{File.dirname(__FILE__)}"
     end
 
     # Patch around the pitfalls of the imho dreadful composer update script in Homestead

diff --git a/apache_heroku.conf b/apache_heroku.conf
diff --git a/apiary.apib b/apiary.apib
diff --git a/app.json b/app.json
diff --git a/behat.yml.dist b/behat.yml.dist
@@ -14,19 +14,6 @@ default:
                     baseUrl: http://localhost:8000
                     # proxyUrl: localhost:8888
                 - Ushahidi\Tests\Integration\Bootstrap\PHPUnitFixtureContext
-            extensions:
-                Behat\MinkExtension:
-                    default_session: laravel
-                    base_url:  http://localhost:8000
-                    laravel: ~
-                    sessions:
-                        default:
-                            goutte: ~
-                    goutte:
-                        guzzle_parameters:
-                            curl.options:
-                                3 : 8000 #CURLOPT_PORT=3
-                                # 10004: localhost:8888 #CURLOPT_PROXY=10004
 ci:
     suites:
         default: