086cf8a8d7
Merge pull request #764 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-05 21:58:23 +02:00
463f250f26
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-05 21:48:25 +02:00
708c12af1e
Leave unknown language as nil if account is remote ( #8861 )
...
* Force use language detector if account is remote
* Set unknown remote toot's language as nil
2018-10-05 19:17:46 +02:00
72305816ea
[Glitch] Add a confirmation dialog when hitting reply and the compose box isn't empty
2018-10-05 19:08:52 +02:00
f8bae11885
Merge pull request #762 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-05 19:01:44 +02:00
645442b1af
Bump omniauth-saml from 1.10.0 to 1.10.1 ( #8885 )
...
Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml ) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/omniauth/omniauth-saml/releases )
- [Changelog](https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md )
- [Commits](https://github.com/omniauth/omniauth-saml/compare/v1.10.0...v1.10.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-05 19:01:00 +02:00
524282ff6b
Bump parallel_tests from 2.21.3 to 2.23.0 ( #8884 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.21.3 to 2.23.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.21.3...v2.23.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-05 18:59:35 +02:00
b4fedcc15e
Bump puma from 3.11.4 to 3.12.0 ( #8883 )
...
Bumps [puma](https://github.com/puma/puma ) from 3.11.4 to 3.12.0.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v3.11.4...v3.12.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-05 18:58:13 +02:00
d6df42df16
Add a confirmation dialog when hitting reply and the compose box isn't empty ( #8893 )
...
* Add a confirmation dialog when hitting reply and the compose box isn't empty
Fixes #878
* Performance improvement
2018-10-05 18:44:44 +02:00
f627ea99e4
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
5cdaec1ec2
[Security] Bump nokogiri from 1.8.4 to 1.8.5 ( #8881 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.8.4 to 1.8.5. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.4...v1.8.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-05 04:07:44 +02:00
c883b1ffc9
lint pass 2 ( #8878 )
...
* Code quality pass
* Typofix
* Update applications_controller_spec.rb
* Update applications_controller_spec.rb
2018-10-04 17:38:04 +02:00
48c2ab8cf5
Limit the number of people that can be followed from one account ( #8807 )
...
Configurable soft limit of 7,500, and above that, configurable
ratio of 1.1 * followers, controlled by:
- MAX_FOLLOWS_THRESHOLD
- MAX_FOLLOWS_RATIO
Fix #2311
2018-10-04 17:36:11 +02:00
1a1160ee24
Add tootctl settings registrations open ( #8829 )
2018-10-04 16:05:54 +02:00
1ae62b87ed
Change admin accounts default sort to most recent ( #8813 )
2018-10-04 16:05:38 +02:00
24f168e58e
Fix link verification for remote accounts ( #8868 )
2018-10-04 15:47:03 +02:00
59ed79b1f0
Dockerfile: update Node to 8.12.0 and put Ruby on Alpine 3.7 for build system memory help ( #8842 )
2018-10-04 15:37:31 +02:00
dba3a17481
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
a53bcb6213
Lint pass ( #8876 )
2018-10-04 12:36:53 +02:00
5c7944c05d
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
f2fb5ff317
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
d5137ab0e0
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
f038cd9386
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
236c64d3f2
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
df36e809d0
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
e29f71e4ea
German translation issue on landingpage CTA ( #8865 )
...
There is a German translation issue on the landingpage's CTA showing number of users and status posted on the instance.
But as it is right now a verb is missing for the number of status posted. But adding there the right verb like "Zuhause für X Benutzer die Y Status veröffentlichten" the text at the bottom of the numbers is getting a bit too big.
That's the reason I changed wording to "Zuhause für X Benutzer mit Y Statusmeldungen" which seems shorter and more in balance regarding top and bottom text on the numbers.
2018-10-04 01:04:12 +02:00
47eaba870e
Fix handling of ActivityPub activities lacking some attributes ( #8864 )
2018-10-03 23:44:13 +02:00
31e72c8d8a
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
76a58fd933
Bump derailed_benchmarks from 1.3.4 to 1.3.5 ( #8857 )
...
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks ) from 1.3.4 to 1.3.5.
- [Release notes](https://github.com/schneems/derailed_benchmarks/releases )
- [Changelog](https://github.com/schneems/derailed_benchmarks/blob/master/CHANGELOG.md )
- [Commits](https://github.com/schneems/derailed_benchmarks/compare/v1.3.4...v1.3.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-03 15:22:06 +02:00
26e789df21
Bump capistrano-rbenv from 2.1.3 to 2.1.4 ( #8859 )
...
Bumps [capistrano-rbenv](https://github.com/capistrano/rbenv ) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/capistrano/rbenv/releases )
- [Changelog](https://github.com/capistrano/rbenv/blob/master/CHANGELOG.md )
- [Commits](https://github.com/capistrano/rbenv/compare/v2.1.3...v2.1.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-03 15:21:30 +02:00
180c80e6a3
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
ae98c83af8
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
1476e653ec
Make hidden media clickable in account media gallery
2018-10-02 22:00:57 +02:00
c2f963256c
Add media description (or status spoiler) in account media gallery
2018-10-02 22:00:57 +02:00
a62e47672e
Fix account gallery hidden media background color in mastodon-light
2018-10-02 22:00:57 +02:00
e9f2659066
[Glitch] Honour displayMedia setting in accountMedia gallery
...
Inspired by aeca336e22
2018-10-02 22:00:57 +02:00
a7dcf7d1a8
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
62d196a12e
Bump redis from 4.0.1 to 4.0.2 ( #8850 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/redis/redis-rb/releases )
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/redis/redis-rb/compare/v4.0.1...v4.0.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-02 20:16:05 +02:00
1a5d95a32e
Merge pull request #758 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-02 12:01:40 +02:00
53ddb6d042
Bump fastimage from 2.1.1 to 2.1.4 ( #8847 )
...
Bumps [fastimage](https://github.com/sdsykes/fastimage ) from 2.1.1 to 2.1.4.
- [Release notes](https://github.com/sdsykes/fastimage/releases )
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.1...v2.1.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-02 17:20:52 +09:00
c170f4af68
Bump webpush from 0.3.3 to 0.3.4 ( #8846 )
...
Bumps [webpush](https://github.com/zaru/webpush ) from 0.3.3 to 0.3.4.
- [Release notes](https://github.com/zaru/webpush/releases )
- [Commits](https://github.com/zaru/webpush/compare/v0.3.3...v0.3.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-02 15:37:28 +09:00
e1e167a18f
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
5e51b53fc8
Promote colorize to top-level dependency ( #8844 )
2018-10-02 05:34:25 +09:00
536d95ae7c
[Glitch] Add support for new display_media setting
...
Port bb8afc4608
2018-10-01 16:48:55 +02:00
56714ef14c
[Glitch] RTL: fix margins: public-layout.header.nav-button
...
Port bf20094a3f
2018-10-01 14:38:35 +02:00
9bec970736
[Glitch] RTL: fix statubar action buttons/counter margins
...
Port b837c636ac
2018-10-01 14:38:32 +02:00
9617c07724
[Glitch] Separate font-family into variable
...
Port 8913189055
2018-10-01 14:38:29 +02:00
dbc2386ed3
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-01 14:36:06 +02:00
44a3d97eb0
Bump annotate from 2.7.3 to 2.7.4 ( #8840 )
...
Bumps [annotate](https://github.com/ctran/annotate_models ) from 2.7.3 to 2.7.4.
- [Release notes](https://github.com/ctran/annotate_models/releases )
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc )
- [Commits](https://github.com/ctran/annotate_models/compare/v2.7.3...v2.7.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-01 14:10:07 +02:00
d54f7a2a91
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
ThibG