]> cat aescling's git repositories - mastodon.git/log
mastodon.git
6 years agoChange poll options to alphabetic letters when status text is hidden (#10685)
Eugen Rochko [Sat, 18 May 2019 12:41:16 +0000 (14:41 +0200)]
Change poll options to alphabetic letters when status text is hidden (#10685)

Fix #10569

6 years agoRemove 'Weblate' from CONTRIBUTING.md (#10778)
Yusuke Nakamura [Sat, 18 May 2019 12:40:55 +0000 (21:40 +0900)]
Remove 'Weblate' from CONTRIBUTING.md (#10778)

The mastodon project no longer used weblate to translate UI
sentences. (ref #10385)

6 years agoPrevent from publicly boosting one's own private toots (#10775)
ThibG [Fri, 17 May 2019 22:28:51 +0000 (00:28 +0200)]
Prevent from publicly boosting one's own private toots (#10775)

6 years agoBump aws-sdk-s3 from 1.38.0 to 1.39.0 (#10773)
dependabot[bot] [Fri, 17 May 2019 06:23:21 +0000 (15:23 +0900)]
Bump aws-sdk-s3 from 1.38.0 to 1.39.0 (#10773)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.38.0 to 1.39.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/compare/v1.38.0...v1.39.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoi18n: Update Corsican translation (#10770)
Alix Rossi [Fri, 17 May 2019 04:32:46 +0000 (06:32 +0200)]
i18n: Update Corsican translation (#10770)

* i18n: update Corsican translation

* Fix typo in co.yml

6 years agoBump capybara from 3.19.1 to 3.20.0 (#10768)
dependabot[bot] [Thu, 16 May 2019 07:13:52 +0000 (16:13 +0900)]
Bump capybara from 3.19.1 to 3.20.0 (#10768)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.19.1 to 3.20.0.
- [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/3.19.1...3.20.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump aws-sdk-s3 from 1.36.1 to 1.38.0 (#10769)
dependabot[bot] [Thu, 16 May 2019 06:00:24 +0000 (15:00 +0900)]
Bump aws-sdk-s3 from 1.36.1 to 1.38.0 (#10769)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.36.1 to 1.38.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/compare/v1.36.1...v1.38.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoUpdate simple_form.fr.yml (#10756)
manuelviens [Wed, 15 May 2019 05:52:11 +0000 (01:52 -0400)]
Update simple_form.fr.yml (#10756)

Remplacement des ' par des ’

6 years agoMinor performance improvements and cleanup in formatter (#10765)
ThibG [Wed, 15 May 2019 04:54:06 +0000 (06:54 +0200)]
Minor performance improvements and cleanup in formatter (#10765)

6 years agoAdds click-able div that expands status (#10733) (#10766)
Neil Moore [Wed, 15 May 2019 04:53:23 +0000 (00:53 -0400)]
Adds click-able div that expands status (#10733) (#10766)

The clickable div is positioned under the account avatar and covers
all empty space below it to the end of the status.

6 years agoRecord account suspend/silence time and keep track of domain blocks (#10660)
ThibG [Tue, 14 May 2019 17:05:02 +0000 (19:05 +0200)]
Record account suspend/silence time and keep track of domain blocks (#10660)

* Record account suspend/silence time and keep track of domain blocks

* Also unblock users who were suspended/silenced before dates were recorded

* Add tests

* Keep track of suspending date for users suspended through the CLI

* Show accurate number of accounts that would be affected by unsuspending an instance

* Change migration to set silenced_at and suspended_at

* Revert "Also unblock users who were suspended/silenced before dates were recorded"

This reverts commit a015c65d2d1e28c7b7cfab8b3f8cd5fb48b8b71c.

* Switch from using suspended and silenced to suspended_at and silenced_at

* Add post-deployment migration script to remove `suspended` and `silenced` columns

* Use Account#silence! and Account#suspend! instead of updating the underlying property

* Add silenced_at and suspended_at migration to post-migration

* Change account fabricator to translate suspended and silenced attributes

* Minor fixes

* Make unblocking domains always retroactive

6 years agoUpdate slovak simple_forms (#10763)
Marek Ľach [Tue, 14 May 2019 10:55:47 +0000 (12:55 +0200)]
Update slovak simple_forms (#10763)

6 years agoBump capybara from 3.18.0 to 3.19.1 (#10758)
dependabot[bot] [Tue, 14 May 2019 06:01:47 +0000 (15:01 +0900)]
Bump capybara from 3.18.0 to 3.19.1 (#10758)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.18.0 to 3.19.1.
- [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/3.18.0...3.19.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump brakeman from 4.5.0 to 4.5.1 (#10757)
dependabot[bot] [Tue, 14 May 2019 06:01:22 +0000 (15:01 +0900)]
Bump brakeman from 4.5.0 to 4.5.1 (#10757)

Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.5.0 to 4.5.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.5.0...v4.5.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump rubocop from 0.68.1 to 0.69.0 (#10762)
dependabot[bot] [Tue, 14 May 2019 06:00:58 +0000 (15:00 +0900)]
Bump rubocop from 0.68.1 to 0.69.0 (#10762)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.1 to 0.69.0.
- [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.68.1...v0.69.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoFix some colors in light theme (#10754)
nzws [Sun, 12 May 2019 03:15:42 +0000 (12:15 +0900)]
Fix some colors in light theme (#10754)

* Fix typo in light theme

* Fix background color of empty column

6 years agoFix incorrect reference to raw_content (it is raw_text instead) (#10753)
ThibG [Sat, 11 May 2019 21:56:07 +0000 (23:56 +0200)]
Fix incorrect reference to raw_content (it is raw_text instead) (#10753)

6 years agoAdd toot source to delete result to ease Delete & Redraft (#10669)
ThibG [Sat, 11 May 2019 04:46:43 +0000 (06:46 +0200)]
Add toot source to delete result to ease Delete & Redraft (#10669)

* Return Status with raw text in raw_content when deleting a status

* Use raw content if available on delete & redraft

* Rename raw_content to text; do not serialize formatted content when source is requested

6 years agoUse local time in audit log (#10751)
nzws [Sat, 11 May 2019 04:46:02 +0000 (13:46 +0900)]
Use local time in audit log (#10751)

6 years agoi18n: Update French translations (#10747)
Alix Rossi [Fri, 10 May 2019 16:09:47 +0000 (18:09 +0200)]
i18n: Update French translations (#10747)

* Update French JSON

* i18n: Update fr.yml

* i18n: Update simple_form.fr.yml

* Update simple_form.fr.yml

* Update fr.yml

6 years agoi18n: Update Corsican translations (#10746)
Alix Rossi [Fri, 10 May 2019 16:09:34 +0000 (18:09 +0200)]
i18n: Update Corsican translations (#10746)

* i18n: Update Corsican translations

* Update co.yml

* Fix a translation in co.yml

6 years agoChange icon and label depending on whether media is marked as sensitive (#10748)
ThibG [Fri, 10 May 2019 15:59:57 +0000 (17:59 +0200)]
Change icon and label depending on whether media is marked as sensitive (#10748)

* Change icon and label depending on whether media is marked as sensitive

* WiP use a checkbox

6 years agoUpdate simple_form.fr.yml (#10726)
manuelviens [Thu, 9 May 2019 21:16:24 +0000 (17:16 -0400)]
Update simple_form.fr.yml (#10726)

* Minor modif and add

Modified '' by ’ and added invite_request

* Update simple_form.fr.yml

Modifications suggérées par ThibG

* Update simple_form.fr.yml

Remplacement des ' par des ’.

* Update simple_form.fr.yml

Ajout de deux petits espaces devant sessions:

6 years agoAdd strings for Slovak (#10734)
Marek Ľach [Thu, 9 May 2019 21:16:05 +0000 (23:16 +0200)]
Add strings for Slovak (#10734)

* Add strings for Slovak

* Update sk.yml

6 years agoUpdate fr.yml (#10727)
manuelviens [Thu, 9 May 2019 21:15:39 +0000 (17:15 -0400)]
Update fr.yml (#10727)

* Update fr.yml

Added missing lines

* Update fr.yml

Application des modifications de ThibG

* Update fr.yml

Modifications proposées par ThibG

6 years agoAdd ES_PREFIX in .env.production.sample (#10087)
Stanislas [Thu, 9 May 2019 20:41:27 +0000 (22:41 +0200)]
Add ES_PREFIX in .env.production.sample (#10087)

6 years agoAdd confirm modal for unboosting toots (#10287)
Aurélien Reeves [Thu, 9 May 2019 20:39:27 +0000 (22:39 +0200)]
Add confirm modal for unboosting toots (#10287)

[#3815]

Display the boost modal also when unboosting toots.

6 years agoAdd emoji suggestions to CW and poll option fields (#10555)
ThibG [Thu, 9 May 2019 20:10:27 +0000 (22:10 +0200)]
Add emoji suggestions to CW and poll option fields (#10555)

* Refactor selectComposeSuggestion so that different paths can be updated

* Add suggestions in CW field

* Add emoji suggestion to poll options

* Attempt to fix CSS

* Hide suggestions by default

They will be enabled if the input has focus

6 years agoPrevent silenced local users from notifying remote users not following them (#10575)
ThibG [Thu, 9 May 2019 20:05:43 +0000 (22:05 +0200)]
Prevent silenced local users from notifying remote users not following them (#10575)

* Prevent silenced local users from notifying remote users not following them

This is an attempt to extend the local restrictions of silenced users to the
federation.

* Add tests

* Add tests for making sure private status don't get sent over OStatus

6 years agoAdd some caching for HTML versions of statuses pages (#10701)
ThibG [Thu, 9 May 2019 20:03:44 +0000 (22:03 +0200)]
Add some caching for HTML versions of statuses pages (#10701)

6 years agoImprove poll link accessibility (#10720)
Maciek Baron [Thu, 9 May 2019 20:03:32 +0000 (21:03 +0100)]
Improve poll link accessibility (#10720)

* Add distinction between hover and active/focus states
* Resolves #10198

6 years agoRemove custom emojis on "tootctl domains purge" (#10721)
Jeong Arm [Thu, 9 May 2019 20:03:21 +0000 (05:03 +0900)]
Remove custom emojis on "tootctl domains purge" (#10721)

* Remove custom emojis on domains purge

* Change message "Removing" to "Removed"

6 years agoRecord deleted(by mod) status to prevent re-appear (#10732)
Jeong Arm [Thu, 9 May 2019 20:03:03 +0000 (05:03 +0900)]
Record deleted(by mod) status to prevent re-appear (#10732)

* Record deleted(by mod) status to prevent re-appear

* Move to Tombstone

* Add missing migration script

6 years agoBring back crossed eye icon on gallery (#10715)
Jeong Arm [Wed, 8 May 2019 16:01:33 +0000 (01:01 +0900)]
Bring back crossed eye icon on gallery (#10715)

6 years agoFix some colors of high contrast theme (#10711)
nzws [Tue, 7 May 2019 21:53:58 +0000 (06:53 +0900)]
Fix some colors of high contrast theme (#10711)

* Fix "nothing here" text color of high contrast

* Fix counter border color of high contrast

6 years agoBump redis from 4.1.0 to 4.1.1 (#10722)
dependabot[bot] [Tue, 7 May 2019 05:47:46 +0000 (14:47 +0900)]
Bump redis from 4.1.0 to 4.1.1 (#10722)

Bumps [redis](https://github.com/redis/redis-rb) from 4.1.0 to 4.1.1.
- [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.1.0...v4.1.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoi18n Update Catalan translation (#10719)
spla [Mon, 6 May 2019 15:55:37 +0000 (17:55 +0200)]
i18n Update Catalan translation (#10719)

* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translation

* i18n Update Catalan translation

6 years agoBump parallel_tests from 2.28.0 to 2.29.0 (#10716)
dependabot[bot] [Mon, 6 May 2019 06:12:55 +0000 (15:12 +0900)]
Bump parallel_tests from 2.28.0 to 2.29.0 (#10716)

Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.28.0 to 2.29.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.28.0...v2.29.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoAdd description on hover in media gallery (#10713)
ThibG [Mon, 6 May 2019 03:33:56 +0000 (05:33 +0200)]
Add description on hover in media gallery (#10713)

6 years agoi18n: Update Japanese translations (#10706)
mayaeh [Sun, 5 May 2019 19:34:32 +0000 (04:34 +0900)]
i18n: Update Japanese translations (#10706)

* Update Japanese translations.

run yarn manage:translations

This commit includes translations by some users that were done at the transifex.

* Reduce translation text because it becomes two lines.

6 years ago1 NL string update (#10709)
jeroenpraat [Sun, 5 May 2019 19:33:24 +0000 (21:33 +0200)]
1 NL string update (#10709)

* 1 NL string update

No that weblate isn't used anymore, it would be fine if, or the english strings are update, or there is somewhere an explanation how to generate new strings for a language

* Update nl.json

6 years agoBump version to 2.8.2 (#10703)
Eugen Rochko [Sun, 5 May 2019 15:14:15 +0000 (17:14 +0200)]
Bump version to 2.8.2 (#10703)

6 years agoMinor Slovak locale update (#10705)
Marek Ľach [Sun, 5 May 2019 08:25:35 +0000 (10:25 +0200)]
Minor Slovak locale update (#10705)

6 years agoI18n: Update Czech translation 🇨🇿 (#10704)
Aditoo17 [Sun, 5 May 2019 06:33:33 +0000 (08:33 +0200)]
I18n: Update Czech translation 🇨🇿 (#10704)

* I18n: Update Czech translation

* Tiny fix

6 years agoMake sure the instance banner is never cropped (#10702)
Baptiste Gelez [Sat, 4 May 2019 23:07:15 +0000 (00:07 +0100)]
Make sure the instance banner is never cropped (#10702)

6 years agoBump blurhash from 0.1.2 to 0.1.3 (#10700)
Eugen Rochko [Sat, 4 May 2019 20:52:54 +0000 (22:52 +0200)]
Bump blurhash from 0.1.2 to 0.1.3 (#10700)

6 years agoFix transition: all (#10699)
ThibG [Sat, 4 May 2019 15:39:53 +0000 (17:39 +0200)]
Fix transition: all (#10699)

6 years agoAdd SOURCE_TAG to show source repository's tag (#10698)
Ushitora Anqou [Sat, 4 May 2019 15:39:17 +0000 (00:39 +0900)]
Add SOURCE_TAG to show source repository's tag (#10698)

6 years agoMinor account media gallery fixes (#10695)
ThibG [Sat, 4 May 2019 15:36:43 +0000 (17:36 +0200)]
Minor account media gallery fixes (#10695)

* Make the cursor icon consistant across media types in account media gallery

* Fix the video player modal causing scroll position to reset

6 years agoi18n: Update Corsican translation (#10692)
Alix Rossi [Sat, 4 May 2019 11:09:25 +0000 (13:09 +0200)]
i18n: Update Corsican translation (#10692)

6 years agoAdd `tootctl cache clear` (#10689)
Eugen Rochko [Fri, 3 May 2019 23:02:57 +0000 (01:02 +0200)]
Add `tootctl cache clear` (#10689)

6 years agoBump version to 2.8.1 (#10687)
Eugen Rochko [Fri, 3 May 2019 22:31:06 +0000 (00:31 +0200)]
Bump version to 2.8.1 (#10687)

6 years agoDo not retry processing ActivityPub jobs raising validation errors (#10614)
ThibG [Fri, 3 May 2019 21:45:37 +0000 (23:45 +0200)]
Do not retry processing ActivityPub jobs raising validation errors (#10614)

* Do not retry processing ActivityPub jobs raising validation errors

Jobs yielding validation errors most probably won't ever be accepted,
so it makes sense not to clutter the queues with retries.

* Lower RecordInvalid error reporting to debug log level

* Remove trailing whitespace

6 years agoChange e-mail whitelist/blacklist to not be checked when invited (#10683)
Eugen Rochko [Fri, 3 May 2019 21:44:44 +0000 (23:44 +0200)]
Change e-mail whitelist/blacklist to not be checked when invited (#10683)

* Change e-mail whitelist/blacklist to not be checked when invited

And only when creating an account, not when updating it later

Fix #10648

* Fix test

6 years agoFix accounts created through tootctl not being always pre-approved (#10684)
Eugen Rochko [Fri, 3 May 2019 18:49:27 +0000 (20:49 +0200)]
Fix accounts created through tootctl not being always pre-approved (#10684)

Add `--approve` option to `tootctl accounts modify`

6 years agoChange font weight of sensitive button to 500 (#10682)
Eugen Rochko [Fri, 3 May 2019 18:44:20 +0000 (20:44 +0200)]
Change font weight of sensitive button to 500 (#10682)

6 years agoExplicitly disable storage of REST API results (#10655)
ThibG [Fri, 3 May 2019 18:39:19 +0000 (20:39 +0200)]
Explicitly disable storage of REST API results (#10655)

Fixes #10652

6 years agoProvide a link to existing domain block when trying to block an already-blocked domai...
ThibG [Fri, 3 May 2019 18:36:36 +0000 (20:36 +0200)]
Provide a link to existing domain block when trying to block an already-blocked domain (#10663)

* When trying to block an already-blocked domain, provide a link to the block

* Fix styling for links in flash messages

* Allow blocks to be upgraded but not downgraded

6 years agoAdd button to view context to media modal (#10676)
Eugen Rochko [Fri, 3 May 2019 14:16:30 +0000 (16:16 +0200)]
Add button to view context to media modal (#10676)

* Add "view context" button to media modal when opened from gallery

* Add "view context" button to video modal

Allow closing the video modal by navigating back in the browser,
just like the media modal

6 years agoBump rack-attack from 5.4.2 to 6.0.0 (#10599)
dependabot[bot] [Fri, 3 May 2019 14:16:11 +0000 (16:16 +0200)]
Bump rack-attack from 5.4.2 to 6.0.0 (#10599)

* Bump rack-attack from 5.4.2 to 6.0.0

Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.4.2 to 6.0.0.
- [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.4.2...v6.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
* fix payload[:request]

6 years agoBump scss_lint from 0.57.1 to 0.58.0 (#10678)
dependabot[bot] [Fri, 3 May 2019 08:29:53 +0000 (17:29 +0900)]
Bump scss_lint from 0.57.1 to 0.58.0 (#10678)

Bumps [scss_lint](https://github.com/sds/scss-lint) from 0.57.1 to 0.58.0.
- [Release notes](https://github.com/sds/scss-lint/releases)
- [Changelog](https://github.com/sds/scss-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/scss-lint/compare/v0.57.1...v0.58.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump fabrication from 2.20.1 to 2.20.2 (#10677)
dependabot[bot] [Fri, 3 May 2019 06:01:38 +0000 (15:01 +0900)]
Bump fabrication from 2.20.1 to 2.20.2 (#10677)

Bumps [fabrication](https://github.com/paulelliott/fabrication) from 2.20.1 to 2.20.2.
- [Release notes](https://github.com/paulelliott/fabrication/releases)
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown)
- [Commits](https://github.com/paulelliott/fabrication/compare/2.20.1...2.20.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoWhen selecting a toot via keyboard, ensure it is scrolled into view (#10593)
ThibG [Fri, 3 May 2019 04:20:36 +0000 (06:20 +0200)]
When selecting a toot via keyboard, ensure it is scrolled into view (#10593)

6 years agoMake the "mark media as sensitive" button more obvious in web UI (#10673)
Eugen Rochko [Fri, 3 May 2019 02:34:55 +0000 (04:34 +0200)]
Make the "mark media as sensitive" button more obvious in web UI (#10673)

* Make the "mark media as sensitive" button more obvious in web UI

* Use eye-slash icon instead of eye icon to mean "hide"

6 years agoFix alignment of items in the account gallery in web UI and load more per page (...
Eugen Rochko [Fri, 3 May 2019 02:02:55 +0000 (04:02 +0200)]
Fix alignment of items in the account gallery in web UI and load more per page (#10674)

6 years agoChange account gallery in web UI (#10667)
Eugen Rochko [Thu, 2 May 2019 06:34:32 +0000 (08:34 +0200)]
Change account gallery in web UI (#10667)

- 3 items per row instead of 2
- Use blurhash for previews
- Animate/hover-to-play GIFs and videos
- Open media modal instead of opening status
- Allow opening status instead with ctrl+click and open in new tab

6 years agoCheck that an invite link is valid before bypassing approval mode (#10657)
ThibG [Thu, 2 May 2019 02:30:12 +0000 (04:30 +0200)]
Check that an invite link is valid before bypassing approval mode (#10657)

* Check that an invite link is valid before bypassing approval mode

Fixes #10656

* Add tests

* Only consider valid invite links in registration controller

* fixup

6 years agoDisallow robots from indexing /interact/ (#10666)
ThibG [Wed, 1 May 2019 22:10:19 +0000 (00:10 +0200)]
Disallow robots from indexing /interact/ (#10666)

This does not provide any new information and may just triple the number
of crawled pages

6 years agoMinor fixes to the French translation (#10662)
ThibG [Wed, 1 May 2019 13:19:55 +0000 (15:19 +0200)]
Minor fixes to the French translation (#10662)

6 years agoBump rubocop from 0.68.0 to 0.68.1 (#10658)
dependabot[bot] [Wed, 1 May 2019 06:49:16 +0000 (15:49 +0900)]
Bump rubocop from 0.68.0 to 0.68.1 (#10658)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.0 to 0.68.1.
- [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.68.0...v0.68.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump annotate from 2.7.4 to 2.7.5 (#10651)
dependabot[bot] [Tue, 30 Apr 2019 16:06:09 +0000 (18:06 +0200)]
Bump annotate from 2.7.4 to 2.7.5 (#10651)

Bumps [annotate](https://github.com/ctran/annotate_models) from 2.7.4 to 2.7.5.
- [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.4...2.7.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump bullet from 5.9.0 to 6.0.0 (#10635)
dependabot[bot] [Tue, 30 Apr 2019 16:05:49 +0000 (18:05 +0200)]
Bump bullet from 5.9.0 to 6.0.0 (#10635)

Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.9.0 to 6.0.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.9.0...6.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump rubocop from 0.67.2 to 0.68.0 (#10654)
dependabot[bot] [Tue, 30 Apr 2019 16:05:22 +0000 (18:05 +0200)]
Bump rubocop from 0.67.2 to 0.68.0 (#10654)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.67.2 to 0.68.0.
- [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.67.2...v0.68.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoUpdate hy.json (#10644)
partev [Sun, 28 Apr 2019 03:51:20 +0000 (23:51 -0400)]
Update hy.json (#10644)

6 years agoFix approved column being set to nil instead of false (#10642)
Eugen Rochko [Sat, 27 Apr 2019 21:55:16 +0000 (23:55 +0200)]
Fix approved column being set to nil instead of false (#10642)

Fix https://github.com/tootsuite/mastodon/pull/10621#issuecomment-487316619

6 years agoAdd blurhash (#10630)
Eugen Rochko [Sat, 27 Apr 2019 01:24:09 +0000 (03:24 +0200)]
Add blurhash (#10630)

* Add blurhash

* Use fallback color for spoiler when blurhash missing

* Federate the blurhash and accept it as long as it's at most 5x5

* Display unknown media attachments as blurhash placeholders

* Improve style of embed actions and spoiler button

* Change blurhash resolution from 3x3 to 4x4

* Improve dependency definitions

* Fix code style issues

6 years agoNew string added for Slovak translation (#10637)
Marek Ľach [Fri, 26 Apr 2019 16:07:36 +0000 (18:07 +0200)]
New string added for Slovak translation (#10637)

6 years agoBump bootsnap from 1.4.3 to 1.4.4 (#10634)
dependabot[bot] [Thu, 25 Apr 2019 11:36:56 +0000 (13:36 +0200)]
Bump bootsnap from 1.4.3 to 1.4.4 (#10634)

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.3...v1.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoFix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)
Eugen Rochko [Thu, 25 Apr 2019 00:49:25 +0000 (02:49 +0200)]
Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)

6 years agoFix not being able to save e-mail preference for new pending accounts (#10622)
Eugen Rochko [Thu, 25 Apr 2019 00:49:06 +0000 (02:49 +0200)]
Fix not being able to save e-mail preference for new pending accounts (#10622)

6 years agoFix upload progressbar when image resizing is involved (#10632)
ThibG [Thu, 25 Apr 2019 00:48:54 +0000 (02:48 +0200)]
Fix upload progressbar when image resizing is involved (#10632)

6 years agoReject follow requests of blocked users (#10633)
ThibG [Thu, 25 Apr 2019 00:47:33 +0000 (02:47 +0200)]
Reject follow requests of blocked users (#10633)

6 years agoBump sidekiq from 5.2.6 to 5.2.7 (#10627)
dependabot[bot] [Tue, 23 Apr 2019 14:39:06 +0000 (16:39 +0200)]
Bump sidekiq from 5.2.6 to 5.2.7 (#10627)

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.6 to 5.2.7.
- [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.2.6...v5.2.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump capybara from 3.17.0 to 3.18.0 (#10626)
dependabot[bot] [Tue, 23 Apr 2019 09:53:52 +0000 (18:53 +0900)]
Bump capybara from 3.17.0 to 3.18.0 (#10626)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.17.0 to 3.18.0.
- [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/3.17.0...3.18.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoFix stoplight logging to stderr separate from Rails logger (#10624)
Eugen Rochko [Tue, 23 Apr 2019 02:39:48 +0000 (04:39 +0200)]
Fix stoplight logging to stderr separate from Rails logger (#10624)

6 years agoFix sign up button not saying sign up when invite is used (#10623)
Eugen Rochko [Tue, 23 Apr 2019 02:39:21 +0000 (04:39 +0200)]
Fix sign up button not saying sign up when invite is used (#10623)

Fix #10616

6 years ago[Security] Bump nokogiri from 1.10.2 to 1.10.3 (#10620)
dependabot[bot] [Tue, 23 Apr 2019 01:02:58 +0000 (10:02 +0900)]
[Security] Bump nokogiri from 1.10.2 to 1.10.3 (#10620)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.2 to 1.10.3. **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.10.2...v1.10.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump capybara from 3.16.2 to 3.17.0 (#10602)
dependabot[bot] [Mon, 22 Apr 2019 22:54:51 +0000 (00:54 +0200)]
Bump capybara from 3.16.2 to 3.17.0 (#10602)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.2 to 3.17.0.
- [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/3.16.2...3.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoFixed Healthchecks in docker-compose.yml (#10553)
Fabian Schlenz [Mon, 22 Apr 2019 22:54:26 +0000 (00:54 +0200)]
Fixed Healthchecks in docker-compose.yml (#10553)

6 years agoBump aws-sdk-s3 from 1.36.0 to 1.36.1 (#10618)
dependabot[bot] [Mon, 22 Apr 2019 13:03:20 +0000 (15:03 +0200)]
Bump aws-sdk-s3 from 1.36.0 to 1.36.1 (#10618)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.36.0 to 1.36.1.
- [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/compare/v1.36.0...v1.36.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump doorkeeper from 5.0.2 to 5.1.0 (#10598)
dependabot[bot] [Mon, 22 Apr 2019 13:02:59 +0000 (15:02 +0200)]
Bump doorkeeper from 5.0.2 to 5.1.0 (#10598)

Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.2...v5.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoAllow switching between singe-option and multiple-option polls (#10603)
ThibG [Mon, 22 Apr 2019 12:56:14 +0000 (14:56 +0200)]
Allow switching between singe-option and multiple-option polls (#10603)

6 years agoFix modal items cannot scroll on touch devices (#10605)
kedama [Mon, 22 Apr 2019 12:55:50 +0000 (21:55 +0900)]
Fix modal items cannot scroll on touch devices (#10605)

6 years agoMinor code cleanup (#10613)
ThibG [Mon, 22 Apr 2019 12:55:24 +0000 (14:55 +0200)]
Minor code cleanup (#10613)

6 years agoBump cld3 from 3.2.3 to 3.2.4 (#10617)
dependabot[bot] [Mon, 22 Apr 2019 12:54:19 +0000 (14:54 +0200)]
Bump cld3 from 3.2.3 to 3.2.4 (#10617)

Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases)
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.3...v3.2.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoi18n: Fix misleading strings in Polish translation (#10615)
marcin mikołajczak [Sun, 21 Apr 2019 20:30:04 +0000 (22:30 +0200)]
i18n: Fix misleading strings in Polish translation (#10615)

6 years agoSmall fix Dutch translation (#10612)
jeroenpraat [Sun, 21 Apr 2019 16:44:51 +0000 (18:44 +0200)]
Small fix Dutch translation (#10612)

* Small fix Dutch translation

* Better descriptive titles

See #10611

6 years agoi18n: Update Catalan translation (#10559)
Yamagishi Kazutoshi [Sun, 21 Apr 2019 02:53:45 +0000 (11:53 +0900)]
i18n: Update Catalan translation (#10559)

* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

6 years agoDefault to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg...
Ben Lubar [Sun, 21 Apr 2019 02:53:24 +0000 (21:53 -0500)]
Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs (#10565)

6 years agoAdd hi.json (#10573)
Yamagishi Kazutoshi [Sun, 21 Apr 2019 02:52:20 +0000 (11:52 +0900)]
Add hi.json (#10573)