00fcdebed7
Merge branch 'master' into glitch-soc/merge-upstream
...
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.
2018-10-05 15:23:57 +02:00
da8abef56d
Bump fog-openstack, rspec-rails and fog-core ( #8877 )
...
Bumps [fog-openstack](https://github.com/fog/fog-openstack ), [rspec-rails](https://github.com/rspec/rspec-rails ) and [fog-core](https://github.com/fog/fog-core ). These dependencies needed to be updated together.
Updates `fog-openstack` from 0.3.6 to 1.0.3
- [Release notes](https://github.com/fog/fog-openstack/releases )
- [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fog/fog-openstack/compare/v0.3.6...v1.0.3 )
Updates `rspec-rails` from 3.7.2 to 3.8.0
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.7.2...v3.8.0 )
Updates `fog-core` from 1.45.0 to 2.1.2
- [Release notes](https://github.com/fog/fog-core/releases )
- [Changelog](https://github.com/fog/fog-core/blob/master/changelog.md )
- [Commits](https://github.com/fog/fog-core/compare/v1.45.0...v2.1.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-04 15:35:18 +02:00
928102284a
Bump webmock from 3.3.0 to 3.4.2 ( #8874 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.3.0 to 3.4.2.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.3.0...v3.4.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-04 12:34:17 +02:00
10f7916f37
Bump fuubar from 2.3.1 to 2.3.2 ( #8875 )
...
Bumps [fuubar](https://github.com/thekompanee/fuubar ) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/thekompanee/fuubar/releases )
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md )
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.3.1...releases/v2.3.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-04 12:33:02 +02:00
b70de2cf69
Bump http from 3.2.0 to 3.3.0 ( #8871 )
...
Bumps [http](https://github.com/httprb/http ) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/httprb/http/releases )
- [Changelog](https://github.com/httprb/http/blob/master/CHANGES.md )
- [Commits](https://github.com/httprb/http/compare/v3.2.0...v3.3.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-04 12:32:26 +02:00
ebb3631216
Bump brakeman from 4.2.1 to 4.3.1 ( #8872 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.2.1 to 4.3.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.2.1...v4.3.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-04 12:31:22 +02:00
ad459ab837
Bump fog-openstack from 0.1.25 to 0.3.6 ( #8860 )
...
Bumps [fog-openstack](https://github.com/fog/fog-openstack ) from 0.1.25 to 0.3.6.
- [Release notes](https://github.com/fog/fog-openstack/releases )
- [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fog/fog-openstack/compare/v0.1.25...v0.3.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-04 01:07:13 +02:00
941c9d0d42
Bump aws-sdk-s3 from 1.9.1 to 1.20.0 ( #8848 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.9.1 to 1.20.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-04 01:06:54 +02:00
3b6ab82db7
Bump capybara from 2.18.0 to 3.8.2 ( #8858 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 2.18.0 to 3.8.2.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/2.18.0...3.8.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-03 15:24:48 +02:00
730f196b96
Bump pg from 1.0.0 to 1.1.3 ( #8856 )
...
Bumps [pg](https://bitbucket.org/ged/ruby-pg ) from 1.0.0 to 1.1.3.
- [Changelog](https://bitbucket.org/ged/ruby-pg/src/master/History.rdoc )
- [Commits](https://bitbucket.org/ged/ruby-pg/branches/compare/v1.1.3..v1.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-03 15:20:56 +02:00
53275b949e
Bump httplog from 1.0.2 to 1.1.1 ( #8839 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.0.2 to 1.1.1.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/compare/v1.0.2...v1.1.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-03 04:56:00 +02:00
3f62b119e4
Bump rubocop from 0.55.0 to 0.59.2 ( #8849 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.55.0 to 0.59.2.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.55.0...v0.59.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-02 20:16:51 +02:00
194ad2c90b
Bump rack-attack from 5.2.0 to 5.4.1 ( #8838 )
...
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 5.2.0 to 5.4.1.
- [Release notes](https://github.com/kickstarter/rack-attack/releases )
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kickstarter/rack-attack/compare/v5.2.0...v5.4.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-01 22:49:26 +02:00
3a2f007eb0
Promote colorize to top-level dependency ( #8844 )
2018-10-02 05:34:25 +09:00
24d05c7a50
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-01 14:36:06 +02:00
746da5ccda
Bump ox from 2.9.2 to 2.10.0 ( #8837 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.9.2 to 2.10.0.
- [Release notes](https://github.com/ohler55/ox/releases )
- [Changelog](https://github.com/ohler55/ox/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/ox/compare/v2.9.2...v2.10.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-01 14:08:33 +02:00
c91d9b7389
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/lib/user_settings_decorator.rb
app/models/user.rb
app/serializers/initial_state_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.en.yml
config/locales/simple_form.ja.yml
config/locales/simple_form.pl.yml
config/routes.rb
2018-10-01 12:43:20 +02:00
e09301f414
Adjust bootsnap configuration for newer version ( #8826 )
2018-09-29 18:34:36 +02:00
5da51771cd
Bump oj from 3.5.1 to 3.6.11 ( #8815 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.5.1 to 3.6.11.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.5.1...v3.6.11 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-28 13:34:31 +02:00
e046a987f6
Bump capistrano from 3.10.2 to 3.11.0 ( #8801 )
...
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.10.2 to 3.11.0.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Changelog](https://github.com/capistrano/capistrano/blob/master/CHANGELOG.md )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.10.2...v3.11.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-27 18:24:06 +02:00
7efa3d02c7
Bump sidekiq-scheduler from 2.2.1 to 3.0.0 ( #8789 )
...
Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler ) from 2.2.1 to 3.0.0.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases )
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v2.2.1...v3.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-27 02:11:21 +09:00
65e7c6d9b5
Bump tty-prompt from 0.16.0 to 0.17.0 ( #8791 )
...
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.16.0 to 0.17.0.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases )
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.16.0...v0.17.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-27 02:02:38 +09:00
6e075b9cc4
Bump devise from 4.4.3 to 4.5.0 ( #8778 )
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.4.3 to 4.5.0.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.4.3...v4.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-26 04:27:53 +09:00
8096df1055
Bump sidekiq from 5.1.3 to 5.2.2 ( #8779 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.1.3 to 5.2.2.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v5.1.3...v5.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-25 20:33:00 +02:00
29e2d9e1b7
Bump mime-types from 3.1 to 3.2.2 ( #8781 )
...
Bumps [mime-types](https://github.com/mime-types/ruby-mime-types ) from 3.1 to 3.2.2.
- [Release notes](https://github.com/mime-types/ruby-mime-types/releases )
- [Changelog](https://github.com/mime-types/ruby-mime-types/blob/master/History.md )
- [Commits](https://github.com/mime-types/ruby-mime-types/compare/v3.1...v3.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-25 20:32:37 +02:00
a7f75485d1
Bump pghero from 2.1.0 to 2.2.0 ( #8782 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/ankane/pghero/releases )
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/pghero/compare/v2.1.0...v2.2.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-25 20:31:40 +02:00
56efc28189
Update ruby dependencies ( #8743 )
...
* Update ffi to 1.9.25
* Update private_address_check to 0.5.0
2018-09-21 00:42:59 +02:00
91bef4759f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Vagrantfile
app/javascript/packs/public.js
app/views/admin/settings/edit.html.haml
app/views/settings/preferences/show.html.haml
app/views/settings/profiles/show.html.haml
config/locales/es.yml
config/locales/simple_form.en.yml
config/webpack/configuration.js
config/webpack/loaders/babel.js
package.json
yarn.lock
Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
2018-09-19 21:46:01 +02:00
0ddbccf7e6
Upgrade Babel to version 7.0.0 ( #5925 )
2018-09-14 17:59:48 +02:00
64a5561b5a
update devise_pam_authenticatable2, new feature: pam gets ip address of client ( #8623 )
2018-09-14 17:42:45 +02:00
53b7bb9d04
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/api/v1/mutes_controller.rb
config/locales/simple_form.pl.yml
2018-08-27 18:09:28 +02:00
c597249124
Add thor to Gemfile directly ( #8467 )
...
It's a common dependency, but just in case
2018-08-26 20:02:32 +02:00
36393e1d2b
Merge branch 'master' into glitch-soc/merge-upstream
...
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-26 14:23:24 +02:00
b37ae64578
Upgrade Doorkeeper to 5.0.0 ( #8409 )
...
See doorkeeper-gem/doorkeeper#1137
2018-08-24 18:17:11 +02:00
8b4abaa90d
Merge branch 'master' into glitch-soc/master
...
Conflicts:
config/routes.rb
Added the “endorsements” route from upstream.
2018-08-21 18:24:48 +02:00
f06fa09962
Revert to using Paperclip's filesystem storage, and fix dangling records in 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-21 17:53:01 +02:00
8ac5e651e1
Upgrade doorkeeper to 4.4.2 ( #8321 )
2018-08-20 22:42:02 +02:00
88a0395a58
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-19 09:27:18 +02:00
58ffe3f7c3
Revert "Upgrade Doorkeeper to 4.4.1 ( #8197 )" ( #8231 )
...
* Revert "Upgrade Doorkeeper to 4.4.1 (#8197 )"
This reverts commit 464daffdf9
2018-08-19 03:20:37 +02:00
c6eab9e0aa
Add Makara dependency to support read-replicas ( #8216 )
...
Not active by default unless config/database.yml is edited
2018-08-18 21:06:12 +02:00
464daffdf9
Upgrade Doorkeeper to 4.4.1 ( #8197 )
2018-08-14 20:24:47 +02:00
5f41bbd274
Update Rails ( #8141 )
...
* Update Rails
* fix Update Rails
2018-08-13 18:17:20 +02:00
2aeeffc3ec
Update Rails ( #8141 )
...
* Update Rails
* fix Update Rails
2018-08-12 12:25:23 +02:00
db200226b8
Merge branch 'master' into glitch-soc/merge-upstream
...
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-15 20:51:39 +02:00
53f0452b70
Remove rack-timeout ( #7809 )
...
Timeout considered harmful due to leaving the app in a broken
state, including unreaped database connections
2018-06-15 19:46:25 +02:00
b481e4fac1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
0b1f88cfd5
Upgrade posix-spawn to master ( #7542 )
2018-05-19 02:20:43 +02:00
78ac246b87
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Gemfile
Solved conflicts by using upstream's line for posix-spawn
2018-05-16 21:52:38 +02:00
6bed372ad2
Fix posix-spawn to version 0.3.12 ( #7517 )
...
Because 0.3.13 causes build error in x86 or other ILP32 environments.
closes #7453
2018-05-16 16:52:19 +02:00
ba7ee67498
Merge branch 'master' into glitch-soc/merge
2018-05-14 20:51:50 +02:00
f77b11cd10
Update http_parser.rb to head version ( #7467 )
2018-05-13 11:32:46 +02:00
4d706f9976
Downgrade doorkeeper to version 4.2.6 ( #7456 )
...
ref https://github.com/doorkeeper-gem/doorkeeper/pull/1060
2018-05-12 12:08:12 +02:00
1c9c0167b7
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
8c35d163a5
Port travis_retry for CI ( #7379 )
...
* Port travis_retry for CI
* Add license
2018-05-06 10:55:50 +02:00
54e80bec73
Remove duplicate posix-spawn entry from Gemfile.
2018-05-04 10:11:45 -05:00
e41332c37b
Make posix-spawn spec in Gemfile match what's in Gemfile.lock.
2018-05-04 09:51:18 -05:00
77a92d3260
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
Gemfile.lock
2018-05-04 09:42:31 -05:00
a78b27c7cc
Marginally improve convert/ffmpeg calls performance with posix-spawn ( #7346 )
2018-05-04 13:22:23 +02:00
c816701550
Merge remote-tracking branch 'origin/master' into gs-master
...
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-03 17:23:44 -05:00
ab773e4d5f
Add pry-byebug ( #7307 )
2018-05-03 12:08:54 +02:00
cb5b5cb5f7
Slightly reduce RAM usage ( #7301 )
...
* 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-05-02 18:58:48 +02:00
9613a53cb3
Update dependencies for Ruby (2018-04-23) ( #7237 )
...
* 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-23 11:29:17 +02:00
b438224751
Introduce rspec-retry ( #7206 )
2018-04-20 19:31:30 +02:00
ed490b781f
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
config/application.rb
2018-04-13 16:36:46 -05:00
50529cbceb
Upgrade Rails to version 5.2.0 ( #5898 )
2018-04-12 14:45:17 +02:00
a817f084ea
Merge remote-tracking branch 'tootsuite/master'
...
Conflicts:
app/controllers/statuses_controller.rb
2018-04-12 03:30:57 -05:00
8e88a18316
update gem, test pam authentication ( #7028 )
...
* update gem, test pam authentication
* add description for test parameters
* fix inclusion of optional group
2018-04-11 21:40:38 +02:00
67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master
...
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-08 19:05:02 -05:00
d4de2239b0
Add a circuit breaker for ActivityPub deliveries ( #7053 )
2018-04-07 21:36:58 +02:00
f0bb3ff533
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-30 19:17:17 +00:00
47cee7cc8e
Upgrade charlock_holmes to version 0.7.6 ( #6966 )
...
This version fixes compilation errors when trying to build its native extension with ICU 61.
2018-03-30 09:52:44 +02:00
837b3804bf
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-25 15:17:21 +00:00
28384c1771
Revert "Revert "Upgrade Paperclip to version 6.0.0" ( #6807 )" ( #6808 )
...
This reverts commit 40871caa4b
2018-03-24 12:52:45 +01:00
6290cd7969
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-21 17:17:20 +00:00
d97903a358
Update sanitize and loofah ( #6855 )
...
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-21 17:43:28 +01:00
df70571bfe
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-19 20:17:18 +00:00
0306e3e9be
bugfixes and gem update ( #6831 )
...
* 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-19 20:08:56 +01:00
40871caa4b
Revert "Upgrade Paperclip to version 6.0.0" ( #6807 )
...
* Revert "Bump version to 2.3.2rc1"
This reverts commit cdf8b92fea#6806 )"
This reverts commit 0074cad44f#6782 )"
This reverts commit 4a0a19fe54#6800 )"
This reverts commit 338bff8b93#6754 )"
This reverts commit b88fcd53f7
2018-03-17 14:20:35 +01:00
b88fcd53f7
Upgrade Paperclip to version 6.0.0 ( #6754 )
2018-03-17 12:37:58 +01:00
447d7e6127
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-09 00:17:17 +00:00
4847149b6e
Always install LDAP, CAS and SAML gems, because they don't require deps ( #6663 )
...
Fix #6534
PAM requires a system dependency so...
2018-03-07 02:25:17 +01:00
e9e475a29d
Upgrade chewy to version 5.0.0 ( #6649 )
2018-03-06 06:14:26 +01:00
1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
README.md
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/serializers/rest/instance_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.ja.yml
2018-03-02 21:46:44 -06:00
e4db0f28d2
Update omniauth-saml to 1.10 ( #6587 )
...
Fixes CVE-2017-11428
2018-03-02 02:32:08 +01:00
47bdb9b33b
Fix #942 : Seamless LDAP login ( #6556 )
2018-02-28 19:04:53 +01:00
22a441e374
remove-uglifier ( #6561 )
2018-02-26 16:19:48 +01:00
2e8a492e88
Raise Mastodon::HostValidationError when host for HTTP request is private ( #6410 )
2018-02-24 19:16:11 +01:00
bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
...
# 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
2018-02-23 23:28:31 +09:00
61ed133fea
Account archive download ( #6460 )
...
* Fix #201 : Account archive download
* Export actor and private key in the archive
* Optimize BackupService
- Add conversation to cached associations of status, because
somehow it was forgotten and is source of N+1 queries
- Explicitly call GC between batches of records being fetched
(Model class allocations are the worst offender)
- Stream media files into the tar in 1MB chunks
(Do not allocate media file (up to 8MB) as string into memory)
- Use #bytesize instead of #size to calculate file size for JSON
(Fix FileOverflow error)
- Segment media into subfolders by status ID because apparently
GIF-to-MP4 media are all named "media.mp4" for some reason
* Keep uniquely generated filename in Paperclip::GifTranscoder
* Ensure dumped files do not overwrite each other by maintaing directory partitions
* Give tar archives a good name
* Add scheduler to remove week-old backups
* Fix code style issue
2018-02-21 23:21:32 +01:00
a7171af0a3
Fix avatar and header issues by using custom geometry detector ( #6515 )
...
* Fix avatar and header issues by using custom geometry detector
Revert a part of #6508 . The file passed to dynamic styles method
was not actually a file, but an instance of Paperclip::Attachment,
which broke all styles by always returning {} from the method.
One problem with GIF avatars was that Paperclip::GeometryDetector
reported wrong dimensions for them, e.g. 120x120 GIF avatar would
for some reason be detected as 120x53. By writing our own geometry
parser, we can use FastImage, which also happens to be faster than
ImageMagick, to detect image dimensions, which are also correct.
Unfortunately, this PR does not implement skipping a `convert`
entirely if the dimensions are already correct, as I found no easy
way to write that behaviour into Paperclip without rewriting the
Paperclip::Thumbnail class.
* Only invoke convert if dimension or format needs to be changed
2018-02-21 03:40:12 +01:00
3d033a4687
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
Gemfile
config/locales/simple_form.pl.yml
2018-02-17 00:02:37 -06:00
9dbae6e8a1
Save video metadata and improve video OpenGraph tags ( #6481 )
...
* Save metadata from video attachments, put correct dimensions into OG tags
* Add twitter:player for videos
* Fix code style and test
2018-02-16 07:22:20 +01:00
5ffa6f0fa1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-11 18:17:11 +00:00
cf36d184f4
Interactive `rake mastodon:setup` task ( #6451 )
...
* Add better CLI prompt
* Add rake mastodon:setup interactive wizard
* Test db/redis/smtp configurations and add admin user at the end
* Test database connection even when database does not exist yet
2018-02-11 18:40:57 +01:00
efc9ffcb80
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-11 04:10:16 +00:00
9105b0c954
Introduce html2text for extracting plaintext from statuses. #236 .
...
Unlike strip_tags, html2text will preserve text present in other nodes,
e.g. anchor tags:
[1] pry(main)> str = '<a href="http://www.example.com ">A link</a>'
=> "<a href=\"http://www.example.com \">A link</a>"
[2] pry(main)> Html2Text.convert(str)
=> "[A link](http://www.example.com )"
[3] pry(main)> include ActionView::Helpers::SanitizeHelper
=> Object
[4] pry(main)> strip_tags(str)
=> "A link"
Preserving the href of an anchor allows keyword mutes to also match on
URLs, which is something that the frontend regex filter can currently
do.
2018-02-10 10:36:16 -06:00
3ebc0ad4d3
Full-text search for authorized statuses ( #6423 )
...
* Add full-text search for authorized statuses
- Search API will return statuses that match the query
- Only for logged in users
- Only if you are author of the status,
- Or you were mentioned in it
- Or you favourited or reblogged it
- Configuration over `ES_ENABLED`, `ES_HOST`, `ES_PORT`, `ES_PREFIX`
- Run `rails chewy:deploy` to create & populate index
Fix #5880
Fix #4293
Fix #1152
* Add commented out docker-compose configuration for ES container
* Optimize index import, filter search results
* Add basic normalization to the index
* Add better stemming and normalization to the index
* Skip webfinger request if search query includes both @ and a space
* Fix code style
* Visually separate search result sections
* Fix code style issues
2018-02-09 23:04:47 +01:00
a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
.env.production.sample
app/controllers/auth/confirmations_controller.rb
db/schema.rb
2018-02-04 16:36:19 -06:00
38e0133e1b
Make PAM gem optional, allow configuration over environment ( #6415 )
2018-02-04 15:05:53 +01:00
26f21fd5a0
CAS + SAML authentication feature ( #6425 )
...
* Cas authentication feature
* Config
* Remove class_eval + Omniauth initializer
* Codeclimate review
* Codeclimate review 2
* Codeclimate review 3
* Remove uid/email reconciliation
* SAML authentication
* Clean up code
* Improve login form
* Fix code style issues
* Add locales
2018-02-04 05:42:13 +01:00
Thibaut Girka