me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
38492 commits 2 branches 0 tags 429 MiB
Commit graph

38492 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thibaut Girka
8fef96cbf5 Merge branch 'master' into glitch-soc/merge-upstream 2020-04-04 21:47:37 +02:00
ThibG
ffd6f3fa8a Add explanation as to why unlocked accounts may have follow requests (#13385) 
* Add explanation as to why unlocked accounts may have follow requests

* Change wording to avoid “silenced”
 2020-04-04 19:02:10 +02:00
ThibG
d3ff06a320
Add explanation as to why unlocked accounts may have follow requests (#13385) 
* Add explanation as to why unlocked accounts may have follow requests

* Change wording to avoid “silenced”
 2020-04-04 19:02:10 +02:00
Shlee
97e51733ff Update config.yml (#13379) 2020-04-04 15:52:42 +02:00
Shlee
ae7e3f0933
Update config.yml (#13379) 2020-04-04 15:52:42 +02:00
fuyu
d527154807 Update Vagrant box to Bionic (#13384) 2020-04-04 15:47:48 +02:00
fuyu
51f2315248
Update Vagrant box to Bionic (#13384) 2020-04-04 15:47:48 +02:00
Eugen Rochko
6932e0e2af Add ability to filter audit log in admin UI (#13381) 2020-04-03 13:06:34 +02:00
Eugen Rochko
f65568f1d4
Add ability to filter audit log in admin UI (#13381) 2020-04-03 13:06:34 +02:00
ThibG
7061b36c17 Merge pull request #1310 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-04-02 22:17:29 +02:00
ThibG
5c5317041f Merge pull request #1310 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-04-02 22:17:29 +02:00
Sasha Sorokin
56dba219d1 [Glitch] Improve polls: option lengths & redesign 
Port abbc0c6a87 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:52:53 +02:00
Sasha Sorokin
b367dd713e [Glitch] Improve polls: option lengths & redesign 
Port 37b3985bfa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:52:53 +02:00
Mélanie Chauvel (ariasuni)
660a3d2b7a [Glitch] Improve toot clicking areas 
Port part of 899ff914da to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:49:43 +02:00
Mélanie Chauvel (ariasuni)
2e337d850f [Glitch] Improve toot clicking areas 
Port part of 1fb92037e4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:49:43 +02:00
ThibG
0a02eade54 [Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW 
Port 41ca3cdb37 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:45:46 +02:00
ThibG
9175ebf20c [Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW 
Port cf1fa73347 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:45:46 +02:00
Mélanie Chauvel (ariasuni)
989f819191 [Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI 
Port 5a211c478d  to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:45:03 +02:00
Mélanie Chauvel (ariasuni)
dcf841545d [Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI 
Port be2f1597cf  to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:45:03 +02:00
ThibG
61052dfa33 [Glitch] Fix 404 and 410 API errors being silently discarded in WebUI 
Port front-end changes from 1a993f9675 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:39:44 +02:00
ThibG
3eede6f64b [Glitch] Fix 404 and 410 API errors being silently discarded in WebUI 
Port front-end changes from 0d117c106a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:39:44 +02:00
Thibaut Girka
631dacf1d7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `app/validators/poll_validator.rb`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream added a rule, the way we compute ours is different, but
  that added rule has been ported.
- `package.json`:
  No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
  No real conflict, dependency update. Performed the same update.
 2020-04-02 20:32:00 +02:00
Thibaut Girka
f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `app/validators/poll_validator.rb`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream added a rule, the way we compute ours is different, but
  that added rule has been ported.
- `package.json`:
  No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
  No real conflict, dependency update. Performed the same update.
 2020-04-02 20:32:00 +02:00
dependabot-preview[bot]
37e867d3f2 Bump rspec-rails from 3.9.1 to 4.0.0 (#13364) 
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.1 to 4.0.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.9.1...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-02 18:54:41 +02:00
dependabot-preview[bot]
69558d2fe5
Bump rspec-rails from 3.9.1 to 4.0.0 (#13364) 
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.1 to 4.0.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.9.1...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-02 18:54:41 +02:00
Sasha Sorokin
abbc0c6a87 Improve polls: option lengths & redesign (#13257) 
This commit redesign the polls and increases characters limit for the
options from 25 to 50 characters, giving pollsters more freedom.

Summarizing, the redesign is making the polls more adaptive for upcoming
changes to the options characters limit: the bar, or a "chart", is now
displayed separately from the option itself; vote check mark is moved
next to the option text, making the percentages take less space. Option
lengths are taken into account and text is wrapped to multiple lines
if necessary to avoid overflow.
 2020-04-02 17:10:55 +02:00
Sasha Sorokin
37b3985bfa
Improve polls: option lengths & redesign (#13257) 
This commit redesign the polls and increases characters limit for the
options from 25 to 50 characters, giving pollsters more freedom.

Summarizing, the redesign is making the polls more adaptive for upcoming
changes to the options characters limit: the bar, or a "chart", is now
displayed separately from the option itself; vote check mark is moved
next to the option text, making the percentages take less space. Option
lengths are taken into account and text is wrapped to multiple lines
if necessary to avoid overflow.
 2020-04-02 17:10:55 +02:00
Eugen Rochko
7045cb5d5c Fix tootctl media remove-orphans ignoring PAPERCLIP_ROOT_PATH (#13375) 
Fix #13371
 2020-04-02 05:28:51 +02:00
Eugen Rochko
a9a063c0e9
Fix tootctl media remove-orphans ignoring PAPERCLIP_ROOT_PATH (#13375) 
Fix #13371
 2020-04-02 05:28:51 +02:00
Eugen Rochko
11deb933f5 Fix returning results when searching for URL with non-zero offset (#13377) 
Fix #13083
 2020-04-02 03:39:37 +02:00
Eugen Rochko
c3965e28b3
Fix returning results when searching for URL with non-zero offset (#13377) 
Fix #13083
 2020-04-02 03:39:37 +02:00
Eugen Rochko
c2fc9bca81 Fix pinning a column in web UI sometimes redirecting out of web UI (#13376) 
Fix #13216
 2020-04-02 03:12:10 +02:00
Eugen Rochko
4bf5aeae83
Fix pinning a column in web UI sometimes redirecting out of web UI (#13376) 
Fix #13216
 2020-04-02 03:12:10 +02:00
dependabot-preview[bot]
61a3db761e Bump json-ld from 3.1.1 to 3.1.2 (#13368) 
Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.1...3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-01 10:05:33 +09:00
dependabot-preview[bot]
47ab0bd3e4
Bump json-ld from 3.1.1 to 3.1.2 (#13368) 
Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.1...3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-01 10:05:33 +09:00
dependabot-preview[bot]
cf2f9e48f5 Bump json-ld-preloaded from 3.1.1 to 3.1.2 (#13365) 
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.1...3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-01 10:05:26 +09:00
dependabot-preview[bot]
64980ed8ed
Bump json-ld-preloaded from 3.1.1 to 3.1.2 (#13365) 
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.1...3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-01 10:05:26 +09:00
dependabot-preview[bot]
53438a329f Bump bootsnap from 1.4.5 to 1.4.6 (#13369) 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.5 to 1.4.6.
- [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.5...v1.4.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-01 10:02:35 +09:00
dependabot-preview[bot]
12f6d41284
Bump bootsnap from 1.4.5 to 1.4.6 (#13369) 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.5 to 1.4.6.
- [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.5...v1.4.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-01 10:02:35 +09:00
dependabot-preview[bot]
186c25dc7a Bump tty-prompt from 0.20.0 to 0.21.0 (#13366) 
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.20.0 to 0.21.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.20.0...v0.21.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-01 10:02:24 +09:00
dependabot-preview[bot]
77772baf34
Bump tty-prompt from 0.20.0 to 0.21.0 (#13366) 
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.20.0 to 0.21.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.20.0...v0.21.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-01 10:02:24 +09:00
dependabot-preview[bot]
4add5dd7ff Bump faker from 2.10.1 to 2.11.0 (#13363) 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.10.1 to 2.11.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/commits/v2.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-01 10:01:50 +09:00
dependabot-preview[bot]
66e82e9506
Bump faker from 2.10.1 to 2.11.0 (#13363) 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.10.1 to 2.11.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/commits/v2.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-01 10:01:50 +09:00
dependabot-preview[bot]
a10a1389f7 Bump sidekiq-unique-jobs from 6.0.20 to 6.0.21 (#13367) 
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.20 to 6.0.21.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.20...v6.0.21)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-01 09:50:25 +09:00
dependabot-preview[bot]
662b5874c9
Bump sidekiq-unique-jobs from 6.0.20 to 6.0.21 (#13367) 
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.20 to 6.0.21.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.20...v6.0.21)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-01 09:50:25 +09:00
Eugen Rochko
b1c596e8f3 Fix background jobs not using locks like they are supposed to (#13361) 
Also:

- Fix locks not being removed when jobs go to the dead job queue
- Add UI for managing locks to the Sidekiq dashboard
- Remove unused Sidekiq workers

Fix #13349
 2020-03-31 21:59:03 +02:00
Eugen Rochko
9014367bd8
Fix background jobs not using locks like they are supposed to (#13361) 
Also:

- Fix locks not being removed when jobs go to the dead job queue
- Add UI for managing locks to the Sidekiq dashboard
- Remove unused Sidekiq workers

Fix #13349
 2020-03-31 21:59:03 +02:00
Mélanie Chauvel (ariasuni)
899ff914da Improve toot clicking areas (#13327) 
* Make the area to the left “Show Thread” also expand the toot in Web UI

* Clicking the left part of a conversation with the avatars now opens it in Web UI
 2020-03-31 19:40:23 +02:00
Mélanie Chauvel (ariasuni)
1fb92037e4
Improve toot clicking areas (#13327) 
* Make the area to the left “Show Thread” also expand the toot in Web UI

* Clicking the left part of a conversation with the avatars now opens it in Web UI
 2020-03-31 19:40:23 +02:00
Eugen Rochko
8fa78c0ec8 Fix re-sending of e-mail confirmation not being rate limited (#13360) 
Fix #13330
 2020-03-31 18:20:48 +02:00