From 276432790a5657dbfa3347ef21dd8e1fc7dde489 Mon Sep 17 00:00:00 2001 From: kibigo! Date: Sat, 4 Nov 2017 05:48:42 -0700 Subject: [PATCH] Introducing: Mastodon GO! --- .gitmodules | 3 +++ Vagrantfile | 2 +- app/javascript/themes/mastodon-go | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 app/javascript/themes/mastodon-go diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..35b0cd787d --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "app/javascript/themes/mastodon-go"] + path = app/javascript/themes/mastodon-go + url = https://github.com/marrus-sh/mastodon-go diff --git a/Vagrantfile b/Vagrantfile index 0c21bed68c..351ab5cfaa 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -83,7 +83,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.provider :virtualbox do |vb| vb.name = "mastodon" - vb.customize ["modifyvm", :id, "--memory", "2048"] + vb.customize ["modifyvm", :id, "--memory", "4096"] # Disable VirtualBox DNS proxy to skip long-delay IPv6 resolutions. # https://github.com/mitchellh/vagrant/issues/1172 diff --git a/app/javascript/themes/mastodon-go b/app/javascript/themes/mastodon-go new file mode 160000 index 0000000000..1ba394d1d7 --- /dev/null +++ b/app/javascript/themes/mastodon-go @@ -0,0 +1 @@ +Subproject commit 1ba394d1d7c38fd92159548824d1ba42719df6c3