3fefb7909b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/shared.js`:
Upstream has changed how Tesseract.js gets included and dropped a dependency.
The conflict is caused by glitch-soc having different code due to its
theming system.
Ported upstream changes.
- `lib/mastodon/version.rb`:
Upstream refactor/code style change in a place we replaced upstream's
repo URL with ours.
Ported upstram changes, keeping our repo URL.
- `yarn.lock`:
Upstream dropped dependencies, one of which was textually too close to
a glitch-soc-specific dependency. Not a real conflict.
2020-09-01 17:02:18 +02:00
8972e5f7f6
Bump rubocop from 0.86.0 to 0.88.0 ( #14412 )
...
* Bump rubocop from 0.86.0 to 0.88.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.86.0 to 0.88.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.86.0...v0.88.0 )
Signed-off-by: dependabot[bot] <support@github.com>
* Fix for latest RuboCop
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2020-09-01 03:04:00 +02:00
2cfa142961
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
No real conflict, just a glitch-soc-only dependency textually too close to
one updated upstream. Ported upstream changes.
2020-08-01 20:24:23 +02:00
93dd413a47
Bump version to 3.2.0 ( #14395 )
2020-07-27 00:07:26 +02:00
d1a6f8d5a8
Bump version to 3.2.0rc2 ( #14382 )
2020-07-24 18:47:25 +02:00
1c6c40d17c
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-16 14:43:50 +02:00
6f798eb574
Bump version to 3.2.0rc1 ( #14312 )
2020-07-15 21:07:27 +02:00
3f60b096b5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes.rb`:
Upstream disabled E2EE routes, which we did earlier, but slightly
differently. Took upstream's version.
2020-07-15 15:32:40 +02:00
96e89d1ef4
Bump version to 3.1.5 ( #14284 )
2020-07-10 21:07:30 +02:00
f94aebafe5
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-14 18:49:10 +02:00
06225dee94
Bump version to 3.1.4 ( #13750 )
2020-05-14 07:46:11 +02:00
9101254d0a
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.js`:
Upstream modified code that we split between multiple files due
to glitch-soc's theming system.
Ported those changes.
2020-04-05 18:32:06 +02:00
a889756dd5
Bump version to 3.1.3 ( #13389 )
2020-04-05 06:23:46 +02:00
51d326f852
Merge branch 'master' into glitch-soc/merge-upstream
2020-02-27 12:37:15 +01:00
aa8568b7f2
Bump version to 3.1.2 ( #13162 )
2020-02-27 12:34:07 +01:00
e037002401
Merge branch 'master' into glitch-soc/merge-upstream
2020-02-19 23:04:18 +01:00
b752666e3f
Bump version to 3.1.1 ( #13069 )
2020-02-10 02:55:40 +01:00
dae5e446fe
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile`:
We updated httplog in a separate commit.
Took upstream's change which updated it further.
- `Gemfile.lock`:
We updated httplog in a separate commit.
Took upstream's change which updated it further.
- `app/lib/sanitize_config.rb`:
Upstream added better unsupported link stripping,
while we had different sanitizing configs.
Took only upstream's link stripping code.
- `config/locales/simple_form.pl.yml`:
Strings unused in glitch-soc had been removed from
glitch-soc, reintroduced them even if they are not
useful, to reduce the risk of later merge conflicts.
2020-02-09 12:15:55 +01:00
d2bcef7f6f
Bump version to 3.1.0 ( #13053 )
2020-02-09 00:02:08 +01:00
369201a425
Merge branch 'master' into glitch-soc/merge-upstream
2020-02-03 09:22:58 +01:00
60e160a02d
Bump version to 3.1.0rc2 ( #12999 )
2020-01-28 20:56:32 +01:00
9adeaf2bfc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/statuses_controller.rb`:
Minor conflict due to theming system
2020-01-24 14:37:06 +01:00
4bae4e972d
Bump version to 3.1.0rc1 ( #12932 )
2020-01-24 01:14:51 +01:00
61631f4751
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
e6d111f38b
Bump version to 3.0.1 ( #12116 )
2019-10-09 07:36:57 +02:00
1bbba0016a
Merge tag 'v3.0.0' into glitch-soc/merge-upstream
2019-10-04 19:49:43 +02:00
83d3e7733d
Bump version to 3.0.0 ( #12000 )
2019-10-03 22:44:22 +02:00
a84aedb7a7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream raised max image size from 8MB to 10MB while our limit is
configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +02:00
bae268b2f6
Bump version to 3.0.0rc3 ( #12063 )
2019-10-03 04:13:22 +02:00
16ff7c5627
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
13b06d4b3b
Bump version to 3.0.0rc2 ( #11999 )
2019-09-29 18:50:16 +02:00
e87bcaa107
Bump version to 3.0.0rc1 ( #11900 )
2019-09-21 20:02:14 +02:00
3c8372fa81
Bump version to 2.9.3 ( #11899 )
2019-09-20 22:59:29 +02:00
bca3825c17
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-28 16:28:05 +02:00
a6b4440115
Remove pre from version, add extra suffix variable ( #11407 )
2019-07-26 07:57:27 +02:00
ddd875ad99
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
Upstream added a few fields
- config/application.rb
Upstream added a different paperclip transcoder
2019-06-24 15:02:59 +02:00
b5c772c3d4
Bump version to 2.9.2 ( #11152 )
2019-06-22 17:28:26 +02:00
84f945d64c
Bump version to 2.9.1 ( #11143 )
2019-06-22 01:51:27 +02:00
60adda7e59
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-13 22:23:20 +02:00
c9eeb2e832
Bump version to 2.9.0 ( #11074 )
2019-06-13 20:19:21 +02:00
275f09ccab
Bump version to 2.9.0rc2 ( #11070 )
2019-06-13 00:43:59 +02:00
1b0ff4cd69
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
2019-06-10 18:59:53 +02:00
0949c43ab3
Bump version to 2.9.0rc1 ( #11004 )
2019-06-09 15:53:08 +02:00
20d01a954e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
Conflicts due to the addition of a new preference upstream,
“advanced layout”.
2019-05-26 15:41:40 +02:00
5cdb4c483f
Forward port version bumps to 2.8.3 and 2.8.4 ( #10819 )
...
* Bump version to 2.8.3
* Bump version to 2.8.4
2019-05-24 15:57:31 +02:00
68629f2773
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
minor conflict because of glitch-soc's theming system
2019-05-10 17:09:12 +02:00
2508370f44
Bump version to 2.8.2 ( #10703 )
2019-05-05 17:14:15 +02:00
52a4284fe5
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-04 19:15:50 +02:00
56880fa76a
Add SOURCE_TAG to show source repository's tag ( #10698 )
2019-05-04 17:39:17 +02:00
33c80e0783
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
Thibaut Girka