about summary refs log tree commit diff
path: root/Gemfile.lock
AgeCommit message (Collapse)Author
2018-08-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml
2018-08-26Add thor to Gemfile directly (#8467)Eugen Rochko
It's a common dependency, but just in case
2018-08-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.
2018-08-25fix pam authentication for certain hostnames (#8412)Alexander
2018-08-24Upgrade Doorkeeper to 5.0.0 (#8409)Eugen Rochko
See doorkeeper-gem/doorkeeper#1137
2018-08-21Merge branch 'master' into glitch-soc/masterThibaut Girka
Conflicts: config/routes.rb Added the “endorsements” route from upstream.
2018-08-21Revert to using Paperclip's filesystem storage, and fix dangling records in ↵ThibG
remove_remote (#8339) * Fix uncaching worker * Revert to using Paperclip's filesystem backend instead of fog-local fog-local has lots of concurrency issues, causing failure to delete files, dangling file records, and spurious errors UncacheMediaWorker
2018-08-20Upgrade doorkeeper to 4.4.2 (#8321)ThibG
2018-08-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-19Revert "Upgrade Doorkeeper to 4.4.1 (#8197)" (#8231)AkiraFukushima
* Revert "Upgrade Doorkeeper to 4.4.1 (#8197)" This reverts commit 464daffdf9a37e9a773d224a162fad022890d463. * Except migration files from revert commit
2018-08-18Add Makara dependency to support read-replicas (#8216)Eugen Rochko
Not active by default unless config/database.yml is edited
2018-08-14Upgrade Doorkeeper to 4.4.1 (#8197)Eugen Rochko
2018-08-13Update Rails (#8141)S.H
* Update Rails * fix Update Rails
2018-08-12Update Rails (#8141)S.H
* Update Rails * fix Update Rails
2018-06-21Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields
2018-06-20Update sprockets gem (#7858)Daigo 3 Dango
https://blog.heroku.com/rails-asset-pipeline-vulnerability
2018-06-19Update bcrypt to 3.1.12 fix issue with Fedora (#7845)Eugen Rochko
2018-06-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…
2018-06-15Remove rack-timeout (#7809)Eugen Rochko
Timeout considered harmful due to leaving the app in a broken state, including unreaped database connections
2018-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: config/locales/simple_form.ja.yml
2018-05-19Upgrade posix-spawn to master (#7542)MIYAGI Hikaru
2018-05-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: Gemfile Solved conflicts by using upstream's line for posix-spawn
2018-05-16Fix posix-spawn to version 0.3.12 (#7517)MIYAGI Hikaru
Because 0.3.13 causes build error in x86 or other ILP32 environments. closes #7453
2018-05-14Merge branch 'master' into glitch-soc/mergeThibaut Girka
2018-05-13Update http_parser.rb to head version (#7467)Yamagishi Kazutoshi
2018-05-12Downgrade doorkeeper to version 4.2.6 (#7456)Yamagishi Kazutoshi
ref https://github.com/doorkeeper-gem/doorkeeper/pull/1060
2018-05-10Merge branch 'master' into glitch-soc/masterThibaut Girka
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml
2018-05-06Port travis_retry for CI (#7379)Yamagishi Kazutoshi
* Port travis_retry for CI * Add license
2018-05-04Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: Gemfile.lock
2018-05-04Marginally improve convert/ffmpeg calls performance with posix-spawn (#7346)Eugen Rochko
2018-05-03Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml
2018-05-03Add pry-byebug (#7307)Shuhei Kitagawa
2018-05-02Slightly reduce RAM usage (#7301)Eugen Rochko
* No need to re-require sidekiq plugins, they are required via Gemfile * Add derailed_benchmarks tool, no need to require TTY gems in Gemfile * Replace ruby-oembed with FetchOEmbedService Reduce startup by 45382 allocated objects * Remove preloaded JSON-LD in favour of caching HTTP responses Reduce boot RAM by about 6 MiB * Fix tests * Fix test suite by stubbing out JSON-LD contexts
2018-04-23Update dependencies for Ruby (2018-04-23) (#7237)Yamagishi Kazutoshi
* Update annotate to version 2.7.3 * Update aws-sdk-s3 to version 1.9.2 * Update browser to version 2.5.3 * Update capistrano to version 3.10.2 * Update domain_name to version 0.5.20180417 * Update http to version 3.2.0 * Update lograge to version 0.10.0 * Update oj to version 3.5.1 * Update parallel_tests to version 2.21.3 * Update puma to version 3.11.4 * Update rubocop to version 0.55.0 * Update scss_lint to version 0.57.0 * Update simplecov to version 0.16.1 * Update tty-command to version 0.8.0 * Update tty-prompt to version 0.16.0 * Update pkg-config to version 1.3.0 * Update fog-local to version 0.5.0 * Update fog-openstack to version 0.1.25 * Update devise-two-factor to version 3.0.3 * bundle update
2018-04-20Introduce rspec-retry (#7206)Yamagishi Kazutoshi
2018-04-13Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: Gemfile.lock config/application.rb
2018-04-12Upgrade Rails to version 5.2.0 (#5898)Yamagishi Kazutoshi
2018-04-12Merge remote-tracking branch 'tootsuite/master'David Yip
Conflicts: app/controllers/statuses_controller.rb
2018-04-11update gem, test pam authentication (#7028)Alexander
* update gem, test pam authentication * add description for test parameters * fix inclusion of optional group
2018-04-08Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.
2018-04-07Add a circuit breaker for ActivityPub deliveries (#7053)Eugen Rochko
2018-03-30Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-30Upgrade charlock_holmes to version 0.7.6 (#6966)Pierre-Morgan Gate
This version fixes compilation errors when trying to build its native extension with ICU 61.
2018-03-25Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-24Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808)Yamagishi Kazutoshi
This reverts commit 40871caa4b06c7ee1c3b07f439ed984ead295ced.
2018-03-21Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-21Update sanitize and loofah (#6855)Patrick Figel
Fixes CVE-2018-8048 and CVE-2018-3740, two medium-severity XSS vulnerabilities present in these gems when built against libxml2 >= 2.9.2.
2018-03-19Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-19bugfixes and gem update (#6831)Alexander
* update to new version of devise_pam_authenticatable2 * fix behaviour if suffix is nil, fix environment loading, fix user email creation * code cleanup/fix linter warning
2018-03-17Revert "Upgrade Paperclip to version 6.0.0" (#6807)Eugen Rochko
* Revert "Bump version to 2.3.2rc1" This reverts commit cdf8b92fea269209cedf38c50bca276cdf47b1fe. * Revert "Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806)" This reverts commit 0074cad44ffcbbdbc798f57a21829359741e60d9. * Revert "Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)" This reverts commit 4a0a19fe54f1d2d433ad3d72c35f2bbb915279f6. * Revert "Correct the reference to user's password in mastodon:add_user task (#6800)" This reverts commit 338bff8b93fa939c2968818e53386fd0c013d9a9. * Revert "Upgrade Paperclip to version 6.0.0 (#6754)" This reverts commit b88fcd53f711673b21e5ff4a547dbf929866a2ee.
generated by cgit-pink (git 2.37.1) at 2024-07-01 18:17:28 +0000