| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
|
|
|
|
Conflicts:
db/migrate/20170716191202_add_hide_notifications_to_mute.rb
spec/controllers/application_controller_spec.rb
Took our version, upstream changes were only minor style linting.
|
|
system memory help (#8842)
|
|
* Revert "update vagrant configs (#8706)"
This reverts commit 8971bb8cf29ce940345cf306725dd3f71e8ffded.
* Revert "Updated ruby/node images (#8700)"
This reverts commit 5aae71cf60ba436579e61a330d9cb5d9807ccdd2.
|
|
|
|
|
|
|
|
Conflicts:
Dockerfile
app/javascript/packs/common.js
config/webpack/loaders/sass.js
config/webpack/shared.js
db/schema.rb
package.json
yarn.lock
A lot of the conflicts come from updating webpack.
Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.
Ported glitch changes to webpack 4.x
|
|
* Dockerfile: run asset precompilation as a build step
* Replace OTP_SECRET and SECRET_KEY_BASE with placeholders
|
|
|
|
|
|
Conflicts:
README.md
app/controllers/statuses_controller.rb
app/lib/feed_manager.rb
config/navigation.rb
spec/lib/feed_manager_spec.rb
Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
|
|
|
|
|
|
Conflicts:
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/views/accounts/_header.html.haml
|
|
https://www.ruby-lang.org/en/news/2018/03/28/ruby-2-4-4-released/
> This release includes some bug fixes and some security fixes.
>
> - CVE-2017-17742: HTTP response splitting in WEBrick
> - CVE-2018-6914: Unintentional file and directory creation with directory traversal in tempfile and tmpdir
> - CVE-2018-8777: DoS by large request in WEBrick
> - CVE-2018-8778: Buffer under-read in String#unpack
> - CVE-2018-8779: Unintentional socket creation by poisoned NUL byte in UNIXServer and UNIXSocket
> - CVE-2018-8780: Unintentional directory traversal by poisoned NUL byte in Dir
> - Multiple vulnerabilities in RubyGems
|
|
|
|
|
|
Fix #6809
I don't know why, either
|
|
Fix 6734
|
|
|
|
Yarn was manually installed to meet the Yarn version requirement of
webpacker. Today, Alpine Linux 3.7 provides Yarn new enough.
|
|
It is no longer necessary since commit
be9bab171dc2b1fe43bc742decb71f64541ca347.
|
|
|
|
|
|
|
|
Fix #6605
|
|
Both of yarn and npm are used in Mastodon, but the combined usage requires
a redundant dependency and may lead to data inconsistency.
Considering that yarn has autoclean feature which npm does not have,
this change replaces all npm usage with yarn.
This change requires documentation update. Most notably, the following
command must be executed before assets precompilation if any system
dependency of node-sass has changed:
yarn install --force --pure-lockfile
|
|
When volumes are declared, but the corresponding directories don't exist, permissions for those directories will be root:root instead of mastodon:mastodon..
This changes makes sure the permissions of the volume directories are as expected.
|
|
# Conflicts:
# app/controllers/settings/exports_controller.rb
# app/models/media_attachment.rb
# app/models/status.rb
# app/views/about/show.html.haml
# docker_entrypoint.sh
# spec/views/about/show.html.haml_spec.rb
|
|
|
|
* Set Docker permissions during the build process
* Remove docker_entrypoint.sh and use COPY with chown
|
|
Conflicts:
app/javascript/styles/mastodon/components.scss
app/javascript/styles/mastodon/modal.scss
|
|
|
|
when starting the container.
|
|
/sbin/tini ends up running the Sass compiler, which seems to need a
larger thread stack size than the musl default. This patch incorporates
a fix from
https://raw.githubusercontent.com/jubel-han/dockerfiles/master/common/stack-fix.c,
as described in https://github.com/sass/node-sass/issues/2031.
|
|
|
|
|
|
* Reduce container size with clean yarn
* Merge trouble
|
|
* Update Yarn to version 1.1.0
* remove hard-coding
|
|
* Bump ruby version to 2.4.2
https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-4-2-released/
Gemfile.lock is also updated.
TODO
- [ ] Update Dockerfile with Alpine release of ruby-2.4.2
* Revert jwt version
It seems that jwt 2.0.0 fails in some environment.
ref. https://github.com/zaru/webpush/issues/42
* Bump Ruby version on docker image
|
|
|
|
* Let make and bundler use multiple cores
* Adds -j option to bundle install instead of bundle config
|
|
System default libiconv of Alpine Linux only supports some charset (e.g. UTF-8).
Therefore, the preview card of the page which is not UTF-8 will be broken in the Docker environment.
Using GNU libiconv!
|
|
|
|
|
|
|
