ThibG
|
2b3d268dfb
|
Merge pull request #970 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
|
2019-03-28 15:12:33 +01:00 |
|
ThibG
|
bb316fafff
|
Merge pull request #970 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
|
2019-03-28 15:12:33 +01:00 |
|
Thibaut Girka
|
0117de0a01
|
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
|
2019-03-28 13:01:33 +01:00 |
|
Thibaut Girka
|
050efbc126
|
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
|
2019-03-28 13:01:33 +01:00 |
|
dependabot[bot]
|
db1d883202
|
Bump aws-sdk-s3 from 1.35.0 to 1.36.0 (#10406)
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.35.0 to 1.36.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.35.0...v1.36.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-03-28 16:25:27 +09:00 |
|
dependabot[bot]
|
24d5b6f9e3
|
Bump aws-sdk-s3 from 1.35.0 to 1.36.0 (#10406)
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.35.0 to 1.36.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.35.0...v1.36.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-03-28 16:25:27 +09:00 |
|
dependabot[bot]
|
68d3c33532
|
Bump rails from 5.2.2.1 to 5.2.3 (#10407)
Bumps [rails](https://github.com/rails/rails) from 5.2.2.1 to 5.2.3.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.2.1...v5.2.3)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-03-28 16:25:11 +09:00 |
|
dependabot[bot]
|
85629bf3d3
|
Bump rails from 5.2.2.1 to 5.2.3 (#10407)
Bumps [rails](https://github.com/rails/rails) from 5.2.2.1 to 5.2.3.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.2.1...v5.2.3)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-03-28 16:25:11 +09:00 |
|
Eugen Rochko
|
364e49ae1f
|
Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)
Also, fix some n+1 queries
Resolve #10365
|
2019-03-28 04:44:59 +01:00 |
|
Eugen Rochko
|
f1bc90ab50
|
Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)
Also, fix some n+1 queries
Resolve #10365
|
2019-03-28 04:44:59 +01:00 |
|
dependabot[bot]
|
11b3d88dc8
|
[Security] Bump devise from 4.5.0 to 4.6.2 (#10394)
Bumps [devise](https://github.com/plataformatec/devise) from 4.5.0 to 4.6.2. **This update includes security fixes.**
- [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.5.0...v4.6.2)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-03-28 02:20:53 +01:00 |
|
dependabot[bot]
|
f46f67d984
|
[Security] Bump devise from 4.5.0 to 4.6.2 (#10394)
Bumps [devise](https://github.com/plataformatec/devise) from 4.5.0 to 4.6.2. **This update includes security fixes.**
- [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.5.0...v4.6.2)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-03-28 02:20:53 +01:00 |
|
Eugen Rochko
|
b6bf8e24be
|
Add tootctl search deploy to avoid ugly rake task syntax (#10403)
|
2019-03-28 02:16:11 +01:00 |
|
Eugen Rochko
|
5d41532d94
|
Add tootctl search deploy to avoid ugly rake task syntax (#10403)
|
2019-03-28 02:16:11 +01:00 |
|
Eugen Rochko
|
7aeb50cc89
|
Add order options to relationship manager UI (#10404)
|
2019-03-28 02:16:01 +01:00 |
|
Eugen Rochko
|
08ec7435ce
|
Add order options to relationship manager UI (#10404)
|
2019-03-28 02:16:01 +01:00 |
|
Eugen Rochko
|
f1a582dc15
|
Revert locales touched by automated translations (#10399)
* Revert ruined translations
Regression from #10362
* yarn manage:translations
|
2019-03-28 00:30:47 +01:00 |
|
Eugen Rochko
|
683013756e
|
Revert locales touched by automated translations (#10399)
* Revert ruined translations
Regression from #10362
* yarn manage:translations
|
2019-03-28 00:30:47 +01:00 |
|
Eugen Rochko
|
6e163d5b2a
|
Fix alternative relay support regression (#10398)
Fix #10324
|
2019-03-27 19:58:24 +01:00 |
|
Eugen Rochko
|
e86663b1da
|
Fix alternative relay support regression (#10398)
Fix #10324
|
2019-03-27 19:58:24 +01:00 |
|
dependabot[bot]
|
77718e0b98
|
Bump tzinfo-data from 1.2018.9 to 1.2019.1 (#10396)
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2018.9 to 1.2019.1.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases)
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.9...v1.2019.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-03-27 17:45:31 +01:00 |
|
dependabot[bot]
|
319bce3d9d
|
Bump tzinfo-data from 1.2018.9 to 1.2019.1 (#10396)
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2018.9 to 1.2019.1.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases)
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.9...v1.2019.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-03-27 17:45:31 +01:00 |
|
dependabot[bot]
|
b27559d1c4
|
Bump bootsnap from 1.4.1 to 1.4.2 (#10395)
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.1 to 1.4.2.
- [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.1...v1.4.2)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-03-27 17:44:49 +01:00 |
|
dependabot[bot]
|
852ca12753
|
Bump bootsnap from 1.4.1 to 1.4.2 (#10395)
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.1 to 1.4.2.
- [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.1...v1.4.2)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-03-27 17:44:49 +01:00 |
|
slice
|
da47c30eac
|
Add rel='noopener' to redesigned profile column header avatar link (#10393)
|
2019-03-27 17:08:26 +01:00 |
|
slice
|
73f5711fb8
|
Add rel='noopener' to redesigned profile column header avatar link (#10393)
|
2019-03-27 17:08:26 +01:00 |
|
Aditoo17
|
02d5017d85
|
Fix interpolations in some localizations (#10397)
|
2019-03-27 17:07:35 +01:00 |
|
Aditoo17
|
869e58e7ed
|
Fix interpolations in some localizations (#10397)
|
2019-03-27 17:07:35 +01:00 |
|
Eugen Rochko
|
367ab6764f
|
Remove unused ActivityPub @context values depending on response (#10378)
Fix #8078
|
2019-03-27 15:55:23 +01:00 |
|
Eugen Rochko
|
11fe293e1b
|
Remove unused ActivityPub @context values depending on response (#10378)
Fix #8078
|
2019-03-27 15:55:23 +01:00 |
|
ThibG
|
aa9fbfe842
|
Merge pull request #969 from ThibG/glitch-soc/fixes/revert-emojimart
Revert emojimart update
|
2019-03-27 14:37:44 +01:00 |
|
ThibG
|
0418bdd71f
|
Merge pull request #969 from ThibG/glitch-soc/fixes/revert-emojimart
Revert emojimart update
|
2019-03-27 14:37:44 +01:00 |
|
Thibaut Girka
|
451a79bda3
|
Revert "fix: update to emoji-mart 2.10.0 (#10281)"
This reverts commit e781d842a5.
|
2019-03-27 14:04:58 +01:00 |
|
Thibaut Girka
|
3a2f646cb1
|
Revert "fix: update to emoji-mart 2.10.0 (#10281)"
This reverts commit db06b25376.
|
2019-03-27 14:04:58 +01:00 |
|
Thibaut Girka
|
d72bc923e9
|
Revert "[Glitch] fix: update to emoji-mart 2.10.0"
This reverts commit b0e478fcc5.
|
2019-03-27 14:04:52 +01:00 |
|
Thibaut Girka
|
355d384d8d
|
Revert "[Glitch] fix: update to emoji-mart 2.10.0"
This reverts commit 49bea8c46b.
|
2019-03-27 14:04:52 +01:00 |
|
Thibaut Girka
|
910fd88da2
|
Revert "Fix compilation after emoji-picker change"
This reverts commit 05b79f07fa.
|
2019-03-27 14:04:46 +01:00 |
|
Thibaut Girka
|
497a958297
|
Revert "Fix compilation after emoji-picker change"
This reverts commit 8ea344fed4.
|
2019-03-27 14:04:46 +01:00 |
|
ThibG
|
398b39ca12
|
Merge pull request #968 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
|
2019-03-27 14:02:32 +01:00 |
|
ThibG
|
7535c607f4
|
Merge pull request #968 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
|
2019-03-27 14:02:32 +01:00 |
|
Thibaut Girka
|
add1f52864
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2019-03-27 14:01:19 +01:00 |
|
Thibaut Girka
|
48230b57d2
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2019-03-27 14:01:19 +01:00 |
|
ThibG
|
2e5ec8b7c8
|
Move the account dropdown menubar to the right, make sure it doesn't move (#10390)
* Move the account dropdown menubar to the right, make sure it doesn't move
* Fix margin
|
2019-03-26 23:05:21 +01:00 |
|
ThibG
|
a91acf79b5
|
Move the account dropdown menubar to the right, make sure it doesn't move (#10390)
* Move the account dropdown menubar to the right, make sure it doesn't move
* Fix margin
|
2019-03-26 23:05:21 +01:00 |
|
ThibG
|
1a0de0f62d
|
Merge pull request #966 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
|
2019-03-26 19:51:28 +01:00 |
|
ThibG
|
bdf4f56f9a
|
Merge pull request #966 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
|
2019-03-26 19:51:28 +01:00 |
|
ThibG
|
5ca976c776
|
[Glitch] Add a “Block & Report” button to the block confirmation dialog
Port 36a6089a22 to glitch-soc
|
2019-03-26 17:44:00 +01:00 |
|
ThibG
|
9e80b34a95
|
[Glitch] Add a “Block & Report” button to the block confirmation dialog
Port 6df4a82969 to glitch-soc
|
2019-03-26 17:44:00 +01:00 |
|
Thibaut Girka
|
cab7e62235
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2019-03-26 17:39:20 +01:00 |
|
Thibaut Girka
|
fae53e1a39
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2019-03-26 17:39:20 +01:00 |
|