Merge branch 'master' into master

Running-Mastodon/Administration-guide.md

@@ -62,6 +62,12 @@ only have a user record and an avatar record, with no files uploaded.
 
 This will create a new user as if they had walked through the registration process and confirmed their account, and will immediately be able to log in.  Make sure the user resets their password away from the temporary password you give them!
 
+## Activity monitoring
+
+Munin graphs can be generated to track your instance activity.
+
+* https://github.com/cquest/mastodon-munin-plugins
+
 ## Mastodon-admin mailing list
 
 There's a mailing list open for mastodon instance admins at

Running-Mastodon/Development-guide.md

@@ -17,7 +17,7 @@ The command to install Ruby project dependencies does not require any flags, i.e
 
 Similarly, installing JavaScript dependencies doesn't require any flags:
 
-    yarn install
+    yarn install --pure-lockfile
 
 By default the development environment wants to connect to a `mastodon_development` database on localhost using your user/ident to login to Postgres (i.e. not a md5 password)
 

Running-Mastodon/Production-guide.md

@@ -175,7 +175,7 @@ Then you can proceed to install project dependencies:
 
     gem install bundler
     bundle install --deployment --without development test
-    yarn install
+    yarn install --pure-lockfile
 
 ## Configuration
 
@@ -298,7 +298,7 @@ As part of your deploy, you may need to run:
 
 if anything in the `/db/` directory has changed, and/or
 
-- `yarn install`
+- `yarn install --pure-lockfile`
 - `RAILS_ENV=production bundle exec rails assets:precompile`
 
 if anything in the `/app/assets` directory changed.

Using-Mastodon/Apps.md

@@ -28,6 +28,7 @@ Some people have started working on apps for the Mastodon API. Here is a list of
 |---|--------|----|------------|
 |Retoot|CLI|<https://gitlab.com/mojo42/retoot>|[@Mojo@apoil.org](https://apoil.org/users/mojo)|
 |Mastodon.tools|Wordpress, web browser, social network|<https://github.com/davidlibeau/mastodon-tools>|[@David@mastodon.xyz](https://mastodon.xyz/users/David)|
+|RSSTootalizer|Web browser|<https://github.com/blind-coder/rsstootalizer>|[@blindcoder@toot.berlin](https://toot.berlin/users/blindcoder)|
 
 ## Bots
 

Using-the-API/API.md

@@ -54,6 +54,7 @@ ___
 - [For .Net](https://github.com/Tlaster/Mastodon.Net)
 - [For Java, Kotlin](https://github.com/sys1yagi/mastodon4j)
 - [For C#](https://github.com/pawotter/mastodon-api-cs)
+- [For Haskell](https://github.com/syucream/hastodon)
 - [For C#(.NET Standard)](https://github.com/yamachu/Mastodot)
 
 ___