Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- Dockerfile
  Took upstream version and reverted f13ebd02c91776ddb88b5178bf9015c6e0f1ca80.
  Hopefuly it's not needed anymore.
- app/controllers/api/v1/search_controller.rb
  The conflict was due to us raising the number of results returned.
  Upstream raised it further, so took it.
- config/locales/de.yml
  Took upstream changes to theme translation strings.
- config/locales/gl.yml
  Took upstream changes to theme translation strings.
- config/locales/nl.yml
  Took upstream changes to theme translation strings.
- config/locales/sk.yml
  Took upstream changes to theme translation strings.

1 files changed, 0 insertions, 32 deletions

diff --git a/stack-fix.c b/stack-fix.c
deleted file mode 100644
index 09311a8f0..000000000
--- a/stack-fix.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <dlfcn.h>
-#include <pthread.h>
-#include <stdio.h>
-
-// THIS IS TO AVOID A SIGFAULT WHEN RUNNING python3.6 manage.py runserver
-// This should be fixed at some point by Alpine and/or Python
-// Check this issue for more info
-// https://github.com/docker-library/python/issues/211
-typedef int (*func_t)(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine)(void*), void *arg);
-
-int pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine)(void*), void *arg) {
-
-    pthread_attr_t local;
-    int used = 0, ret;
-
-    if (!attr) {
-        used = 1;
-        pthread_attr_init(&local);
-        attr = &local;
-    }
-    pthread_attr_setstacksize((void*)attr, 2 * 1024 * 1024); // 2 MB
-
-    func_t orig = (func_t)dlsym(RTLD_NEXT, "pthread_create");
-
-    ret = orig(thread, attr, start_routine, arg);
-
-    if (used) {
-        pthread_attr_destroy(&local);
-    }
-
-    return ret;
-}