Commit graph

39662 commits

Author SHA1 Message Date
Thibaut Girka
f938800ef4 Revert to storing application info, and display it to the author via API 2019-01-27 13:56:41 +01:00
Thibaut Girka
bb035bb0ab Make storing and displaying application used to toot opt-in 2019-01-27 13:56:41 +01:00
Thibaut Girka
05415fa5d3 Make storing and displaying application used to toot opt-in 2019-01-27 13:56:41 +01:00
ThibG
b1c76ef610 Prevent posting toots with media attachments from someone else (#9921) 2019-01-26 23:59:39 +01:00
ThibG
e2a5be6e9a Prevent posting toots with media attachments from someone else (#9921) 2019-01-26 23:59:39 +01:00
ThibG
c7f31d81fa Merge pull request #897 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-26 18:47:48 +01:00
ThibG
64cb9b6913
Merge pull request #897 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-26 18:47:48 +01:00
Thibaut Girka
edb28be20b Merge branch 'master' into glitch-soc/merge-upstream 2019-01-26 18:32:49 +01:00
Thibaut Girka
80d954ec10 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-26 18:32:49 +01:00
ThibG
314adc2447 Merge pull request #896 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-25 22:42:21 +01:00
ThibG
270bf7778d
Merge pull request #896 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-25 22:42:21 +01:00
Eugen Rochko
e259f244c6 Fix SSO authentication not working due to missing agreement boolean (#9915)
Fix #9906
2019-01-25 12:36:54 +01:00
Eugen Rochko
9519d55332
Fix SSO authentication not working due to missing agreement boolean (#9915)
Fix #9906
2019-01-25 12:36:54 +01:00
trwnh
36b6fee96d Fix Firefox scrollbar color regression in #9210 (#9908)
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
2019-01-25 11:48:27 +01:00
trwnh
8ef0498f1c Fix Firefox scrollbar color regression in #9210 (#9908)
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
2019-01-25 11:48:27 +01:00
Jeong Arm
fdf6c4a63f Apply style for .landing-page strong (#9892) 2019-01-25 11:48:02 +01:00
Jeong Arm
77394156dd Apply style for .landing-page strong (#9892) 2019-01-25 11:48:02 +01:00
Thibaut Girka
a9c3e77e81 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-25 11:37:49 +01:00
Thibaut Girka
04e2c67389 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-25 11:37:49 +01:00
Renato "Lond" Cerqueira
cde2fe25b9 Rescue SSL error in verify link service (#9914)
If the first link to be verified contains a rel=me link with a SSL
error, the VerifyAccountLinksWorker will fail and not try the following
links. This rescues the SSL error when fetching the link, avoiding this
issue.
2019-01-24 15:38:18 +01:00
Renato "Lond" Cerqueira
e1ec3a9f09 Rescue SSL error in verify link service (#9914)
If the first link to be verified contains a rel=me link with a SSL
error, the VerifyAccountLinksWorker will fail and not try the following
links. This rescues the SSL error when fetching the link, avoiding this
issue.
2019-01-24 15:38:18 +01:00
trwnh
26fc37a2ea Fix Firefox scrollbar color regression in #9210 (#9908)
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
2019-01-24 13:32:23 +01:00
trwnh
c87863bdd1 Fix Firefox scrollbar color regression in #9210 (#9908)
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
2019-01-24 13:32:23 +01:00
ThibG
3ce20bc837 Merge pull request #893 from ThibG/glitch-soc/fixes/dm-column-crash
Fix crash in Direct Messages column settings
2019-01-23 18:53:36 +01:00
ThibG
afec6b43eb
Merge pull request #893 from ThibG/glitch-soc/fixes/dm-column-crash
Fix crash in Direct Messages column settings
2019-01-23 18:53:36 +01:00
Thibaut Girka
5e7c9c04e2 Fix crash in Direct Messages column settings
Fixes #892
2019-01-23 18:29:18 +01:00
Thibaut Girka
c30da25c5f Fix crash in Direct Messages column settings
Fixes #892
2019-01-23 18:29:18 +01:00
dependabot[bot]
3dd3b199e8 Bump oj from 3.7.7 to 3.7.8 (#9900)
Bumps [oj](https://github.com/ohler55/oj) from 3.7.7 to 3.7.8.
- [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.7.7...v3.7.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-22 20:33:20 +09:00
dependabot[bot]
306e1572e8 Bump oj from 3.7.7 to 3.7.8 (#9900)
Bumps [oj](https://github.com/ohler55/oj) from 3.7.7 to 3.7.8.
- [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.7.7...v3.7.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-22 20:33:20 +09:00
dependabot[bot]
3ee6c5cdba Bump rubocop from 0.63.0 to 0.63.1 (#9899)
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.63.0 to 0.63.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.63.0...v0.63.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-22 20:32:49 +09:00
dependabot[bot]
2eae2d271f Bump rubocop from 0.63.0 to 0.63.1 (#9899)
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.63.0 to 0.63.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.63.0...v0.63.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-22 20:32:49 +09:00
Jeong Arm
f909d00241 Apply style for .landing-page strong (#9892) 2019-01-21 20:03:44 +01:00
Jeong Arm
d50e824168 Apply style for .landing-page strong (#9892) 2019-01-21 20:03:44 +01:00
ThibG
a238beb870 Fix scheduled toot with media immediately creating a toot (#9894)
* Add test for not persisting status when attaching media to scheduled toot

* Prevent status used for validation from being persisted to the database

Fixes #9893

Thanks to tateisu for the help investigating this.
2019-01-21 20:03:04 +01:00
ThibG
061feb63ed Fix scheduled toot with media immediately creating a toot (#9894)
* Add test for not persisting status when attaching media to scheduled toot

* Prevent status used for validation from being persisted to the database

Fixes #9893

Thanks to tateisu for the help investigating this.
2019-01-21 20:03:04 +01:00
dependabot[bot]
5fcef3efa5 Bump json-ld-preloaded from 3.0.0 to 3.0.2 (#9891)
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.0...3.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-21 21:39:52 +09:00
dependabot[bot]
dd8a00a3cc Bump json-ld-preloaded from 3.0.0 to 3.0.2 (#9891)
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.0...3.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-21 21:39:52 +09:00
dependabot[bot]
b41575c96f Bump pundit from 2.0.0 to 2.0.1 (#9890)
Bumps [pundit](https://github.com/varvet/pundit) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/varvet/pundit/releases)
- [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/varvet/pundit/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-21 21:39:00 +09:00
dependabot[bot]
3fc0abf8dd Bump pundit from 2.0.0 to 2.0.1 (#9890)
Bumps [pundit](https://github.com/varvet/pundit) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/varvet/pundit/releases)
- [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/varvet/pundit/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-21 21:39:00 +09:00
dependabot[bot]
8caf69a8ca Bump rspec-rails from 3.8.1 to 3.8.2 (#9889)
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.1 to 3.8.2.
- [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.8.1...v3.8.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-21 21:38:37 +09:00
dependabot[bot]
c59b45bf3a Bump rspec-rails from 3.8.1 to 3.8.2 (#9889)
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.1 to 3.8.2.
- [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.8.1...v3.8.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-21 21:38:37 +09:00
dependabot[bot]
b415390cde Bump addressable from 2.5.2 to 2.6.0 (#9888)
Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.5.2 to 2.6.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases)
- [Changelog](https://github.com/sporkmonger/addressable/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.5.2...addressable-2.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-21 21:38:00 +09:00
dependabot[bot]
c30287cf7c Bump addressable from 2.5.2 to 2.6.0 (#9888)
Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.5.2 to 2.6.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases)
- [Changelog](https://github.com/sporkmonger/addressable/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.5.2...addressable-2.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-21 21:38:00 +09:00
ThibG
4d21b6d68e Merge pull request #889 from ThibG/glitch-soc/merge-upstream
Merge upstream changes (v2.7.0)
2019-01-21 11:35:31 +01:00
ThibG
6f53c4fc79
Merge pull request #889 from ThibG/glitch-soc/merge-upstream
Merge upstream changes (v2.7.0)
2019-01-21 11:35:31 +01:00
Thibaut Girka
827933cd09 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-20 16:49:23 +01:00
Thibaut Girka
9dfbcf941e Merge branch 'master' into glitch-soc/merge-upstream 2019-01-20 16:49:23 +01:00
ThibG
8f3fbf4e3b Merge pull request #888 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-20 13:56:37 +01:00
ThibG
aa362ab73d
Merge pull request #888 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-20 13:56:37 +01:00
Eugen Rochko
58f77b7de2 Fix multiple workers for the same scheduled status being queueable (#9875) 2019-01-20 12:57:05 +01:00