about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbeatrix <beatrix.bitrot@gmail.com>2017-11-04 09:14:08 -0400
committerGitHub <noreply@github.com>2017-11-04 09:14:08 -0400
commit73bf0ea7d1675b46eb778c2d8a6129e1f7a0650e (patch)
tree9a5f7dffd55d9636c03a521d314ef61788203f90
parent254b74c71f24304f0a723d38b3ed76f9a70b8c93 (diff)
parent276432790a5657dbfa3347ef21dd8e1fc7dde489 (diff)
Merge pull request #204 from glitch-soc/with-mastodon-go
Introducing: Mastodon GO!
-rw-r--r--.gitmodules3
-rw-r--r--Vagrantfile2
m---------app/javascript/themes/mastodon-go0
3 files changed, 4 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..35b0cd787
--- /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 0c21bed68..351ab5cfa 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
+Subproject 1ba394d1d7c38fd92159548824d1ba42719df6c