about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2022-02-19Merge pull request #1695 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-02-19Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-02-19Bump pundit from 2.1.1 to 2.2.0 (#17543)dependabot[bot]
* Bump pundit from 2.1.1 to 2.2.0 Bumps [pundit](https://github.com/varvet/pundit) from 2.1.1 to 2.2.0. - [Release notes](https://github.com/varvet/pundit/releases) - [Changelog](https://github.com/varvet/pundit/blob/main/CHANGELOG.md) - [Commits](https://github.com/varvet/pundit/compare/v2.1.1...v2.2.0) --- updated-dependencies: - dependency-name: pundit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * `include Pundit` is deprecated Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-19Bump url-parse from 1.5.3 to 1.5.7 (#17584)dependabot[bot]
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.7. - [Release notes](https://github.com/unshiftio/url-parse/releases) - [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.7) --- updated-dependencies: - dependency-name: url-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-19New Crowdin updates (#17514)Eugen Rochko
* New translations en.yml (Catalan) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Albanian) * New translations simple_form.en.yml (Albanian) * New translations en.yml (Albanian) * New translations en.yml (Ukrainian) * New translations en.yml (Ukrainian) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Chinese Traditional) * New translations simple_form.en.yml (Chinese Traditional) * New translations en.yml (Danish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Danish) * New translations en.yml (Chinese Traditional) * New translations simple_form.en.yml (Danish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Chinese Traditional) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations simple_form.en.yml (Chinese Simplified) * New translations en.yml (Galician) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Vietnamese) * New translations en.yml (Indonesian) * New translations simple_form.en.yml (Galician) * New translations en.yml (Japanese) * New translations en.yml (Vietnamese) * New translations en.yml (Indonesian) * New translations simple_form.en.yml (Vietnamese) * New translations en.yml (Hebrew) * New translations en.yml (German) * New translations en.json (German) * New translations en.yml (German) * New translations en.yml (German) * New translations simple_form.en.yml (German) * New translations en.yml (German) * New translations en.yml (Polish) * New translations en.yml (Turkish) * New translations en.yml (Icelandic) * New translations activerecord.en.yml (Icelandic) * New translations devise.en.yml (Icelandic) * New translations en.yml (Polish) * New translations en.yml (Turkish) * New translations en.yml (Swedish) * New translations en.yml (Turkish) * New translations simple_form.en.yml (Turkish) * New translations en.yml (Swedish) * New translations simple_form.en.yml (Swedish) * New translations en.yml (Swedish) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.yml (Icelandic) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations simple_form.en.yml (Hungarian) * New translations en.yml (Icelandic) * New translations en.json (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations en.json (Icelandic) * New translations en.yml (Polish) * New translations en.json (Polish) * New translations en.json (Icelandic) * New translations en.json (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations en.yml (Icelandic) * New translations en.json (Icelandic) * New translations doorkeeper.en.yml (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations activerecord.en.yml (Icelandic) * New translations en.yml (Albanian) * New translations en.yml (Icelandic) * New translations en.yml (Indonesian) * New translations en.json (Russian) * New translations en.yml (Albanian) * New translations en.yml (Indonesian) * New translations en.json (Icelandic) * New translations en.yml (Icelandic) * New translations en.yml (Indonesian) * New translations en.json (Icelandic) * New translations en.yml (Icelandic) * New translations en.yml (Hungarian) * New translations en.yml (Icelandic) * New translations en.yml (Hungarian) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Italian) * New translations en.yml (Italian) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Spanish, Argentina) * New translations en.json (Korean) * New translations en.yml (Thai) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations en.yml (Thai) * New translations en.yml (Spanish) * New translations en.yml (Thai) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations en.yml (Spanish) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations en.yml (Spanish) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations en.yml (Korean) * New translations en.yml (Portuguese) * New translations en.yml (Hungarian) * New translations en.yml (Armenian) * New translations en.yml (Georgian) * New translations en.yml (Dutch) * New translations en.yml (Norwegian) * New translations en.yml (Polish) * New translations en.yml (Albanian) * New translations en.yml (Basque) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Turkish) * New translations en.yml (Ukrainian) * New translations en.yml (Chinese Traditional) * New translations en.yml (Icelandic) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Indonesian) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Greek) * New translations en.yml (Galician) * New translations en.yml (Slovak) * New translations en.yml (Chinese Simplified) * New translations en.yml (Swedish) * New translations en.yml (Arabic) * New translations en.yml (French) * New translations en.yml (Spanish) * New translations en.yml (Catalan) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.yml (Russian) * New translations en.yml (Slovenian) * New translations en.yml (German) * New translations en.yml (Vietnamese) * New translations en.yml (Thai) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * New translations en.yml (Persian) * New translations en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Kabyle) * New translations en.yml (Sardinian) * New translations en.yml (Corsican) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.yml (Malay) * New translations en.yml (Latvian) * New translations en.yml (Estonian) * New translations en.yml (Kazakh) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Galician) * New translations en.yml (Hungarian) * New translations en.yml (Galician) * New translations en.yml (Catalan) * New translations en.yml (Hungarian) * New translations en.yml (Polish) * New translations en.yml (Breton) * New translations en.json (Breton) * New translations en.yml (Galician) * New translations en.yml (Icelandic) * New translations en.yml (Spanish) * New translations en.yml (Icelandic) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Vietnamese) * New translations en.yml (Portuguese) * New translations en.yml (Ukrainian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Portuguese) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Portuguese) * New translations en.yml (Ukrainian) * New translations en.yml (Albanian) * New translations en.yml (Ukrainian) * New translations simple_form.en.yml (Ukrainian) * New translations en.yml (Albanian) * New translations en.yml (Ukrainian) * New translations en.yml (Italian) * New translations en.yml (French) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations en.yml (Chinese Traditional) * New translations en.yml (Chinese Traditional) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Turkish) * New translations en.yml (Latvian) * New translations en.yml (Latvian) * New translations en.json (Russian) * New translations simple_form.en.yml (Russian) * New translations en.yml (Russian) * New translations en.yml (Galician) * New translations en.yml (Russian) * New translations en.yml (Indonesian) * New translations en.yml (Galician) * New translations en.yml (Galician) * New translations en.yml (Russian) * New translations en.yml (Russian) * New translations en.yml (Russian) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Traditional) * Ran `yarn manage:translations` * Ran `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-19Change global `locale` param to `lang` to avoid conflicts (#17592)Eugen Rochko
2022-02-18Fix sign in token and warning emails failed to send in some cases (#17589)helloworldstack
2022-02-18Avoid return within block (#17590)zunda
This prevents the error: LocalJumpError (unexpected return)
2022-02-18Throttle IPv6 signup for subnet (#17588)Jeong Arm
2022-02-17Merge pull request #1692 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-02-17[Glitch] Fix opening the emoji picker scrolling the single-column view to ↵Claire
the top Port aa86cf955755cd05ed9c274daebbec248c39d863 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-17[Glitch] Fix edge case where settings/admin page sidebar would be ↵Claire
incorrectly hidden Port 00b45b967e0c92714e1ec54a2d5c924f8b1dd38b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-17Fix issue with glitch-soc's theming systemClaire
2022-02-17[Glitch] Add appealsEugen Rochko
Port SCSS changes from 564efd06515edc524a8a1cdf7a3d8a7d9a376c04 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-17[Glitch] Fix privacy policy link not being visible on small screensEugen Rochko
Port bbd34744161fc46fa0e75d64e08a2f70d951bb40 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-17Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's.
2022-02-16Fix issues when attempting to appeal an old strike (#17554)Claire
* Display an error when an appeal could not be submitted * Do not offer users to appeal old strikes * Fix 500 error when trying to appeal a strike that is too old * Avoid using an extra translatable string
2022-02-16Fix opening the emoji picker scrolling the single-column view to the top ↵Claire
(#17579) Fixes #17577
2022-02-16Fix edge case where settings/admin page sidebar would be incorrectly hidden ↵Claire
(#17580)
2022-02-16Fix toggling sidebar on mobile in admin pagesClaire
2022-02-16Fix 0 pluralization for some localization strings (#17576)Claire
Apparently, when the `zero` case is not defined, the translation string used for `0` depends on the language. In French, `one` is used, causing some strings with hardcoded “one” or `1` to misrepresent the actual data. For instance, the dashboard would display « 1 utilisateur·rice en attente » for both 0 and 1 pending users.
2022-02-16Change streaming server error messages when failing to parse client input ↵Claire
(#17559) Fixes #17541 - prefix JSON parsing error message by “Error parsing message from …” - output user id if a user is logged in, IP address otherwise - reduce log level from error to warning when a user is logged in, and to silly otherwise
2022-02-16Change relays handling to not record boosts (#17571)Claire
* Change relays handling to not record boosts * Update tests
2022-02-16Fix performance of server-side filtering (#17575)Claire
Fixes #17567
2022-02-16Change dasbhoard links for “new users” and “active users” (#17570)Claire
Make them filter for local accounts by default
2022-02-16Add test for user matching ip (#17572)Jeong Arm
2022-02-16Bump axios from 0.25.0 to 0.26.0 (#17551)dependabot[bot]
Bumps [axios](https://github.com/axios/axios) from 0.25.0 to 0.26.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.25.0...v0.26.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-16Bump scenic from 1.5.5 to 1.6.0 (#17547)dependabot[bot]
Bumps [scenic](https://github.com/scenic-views/scenic) from 1.5.5 to 1.6.0. - [Release notes](https://github.com/scenic-views/scenic/releases) - [Changelog](https://github.com/scenic-views/scenic/blob/main/CHANGELOG.md) - [Commits](https://github.com/scenic-views/scenic/compare/v1.5.5...v1.6.0) --- updated-dependencies: - dependency-name: scenic dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-16Bump pg from 1.3.1 to 1.3.2 (#17555)dependabot[bot]
Bumps [pg](https://github.com/ged/ruby-pg) from 1.3.1 to 1.3.2. - [Release notes](https://github.com/ged/ruby-pg/releases) - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc) - [Commits](https://github.com/ged/ruby-pg/compare/v1.3.1...v1.3.2) --- updated-dependencies: - dependency-name: pg dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15Bump rails from 6.1.4.4 to 6.1.4.6 (#17550)dependabot[bot]
Bumps [rails](https://github.com/rails/rails) from 6.1.4.4 to 6.1.4.6. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v6.1.4.4...v6.1.4.6) --- updated-dependencies: - dependency-name: rails dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15Bump rqrcode from 2.1.0 to 2.1.1 (#17542)dependabot[bot]
Bumps [rqrcode](https://github.com/whomwah/rqrcode) from 2.1.0 to 2.1.1. - [Release notes](https://github.com/whomwah/rqrcode/releases) - [Changelog](https://github.com/whomwah/rqrcode/blob/master/CHANGELOG.md) - [Commits](https://github.com/whomwah/rqrcode/compare/v2.1.0...v2.1.1) --- updated-dependencies: - dependency-name: rqrcode dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15Bump npmlog from 6.0.0 to 6.0.1 (#17545)dependabot[bot]
Bumps [npmlog](https://github.com/npm/npmlog) from 6.0.0 to 6.0.1. - [Release notes](https://github.com/npm/npmlog/releases) - [Changelog](https://github.com/npm/npmlog/blob/main/CHANGELOG.md) - [Commits](https://github.com/npm/npmlog/compare/v6.0.0...v6.0.1) --- updated-dependencies: - dependency-name: npmlog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15Bump @babel/plugin-proposal-decorators from 7.17.0 to 7.17.2 (#17548)dependabot[bot]
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.17.0 to 7.17.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.17.2/packages/babel-plugin-proposal-decorators) --- updated-dependencies: - dependency-name: "@babel/plugin-proposal-decorators" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15Bump babel-jest from 27.5.0 to 27.5.1 (#17549)dependabot[bot]
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 27.5.0 to 27.5.1. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v27.5.1/packages/babel-jest) --- updated-dependencies: - dependency-name: babel-jest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15Bump @babel/runtime from 7.17.0 to 7.17.2 (#17544)dependabot[bot]
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.17.0 to 7.17.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.17.2/packages/babel-runtime) --- updated-dependencies: - dependency-name: "@babel/runtime" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-14Bump dotenv from 10.0.0 to 16.0.0 (#17476)dependabot[bot]
Bumps [dotenv](https://github.com/motdotla/dotenv) from 10.0.0 to 16.0.0. - [Release notes](https://github.com/motdotla/dotenv/releases) - [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md) - [Commits](https://github.com/motdotla/dotenv/compare/v10.0.0...v16.0.0) --- updated-dependencies: - dependency-name: dotenv dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-14Add appeals (#17364)Eugen Rochko
* Add appeals * Add ability to reject appeals and ability to browse pending appeals in admin UI * Add strikes to account page in settings * Various fixes and improvements - Add separate notification setting for appeals, separate from reports - Fix style of links in report/strike header - Change approving an appeal to not restore statuses (due to federation complexities) - Change style of successfully appealed strikes on account settings page - Change account settings page to only show unappealed or recently appealed strikes * Change appealed_at to overruled_at * Fix missing method error
2022-02-14Revert "Bump strong_migrations from 0.7.9 to 0.8.0 (#17504)" (#17540)Claire
This reverts commit f76dd51aa5dadc1799a1e6bd178247069d5acceb.
2022-02-14Remove protobuf dependencies (#17539)Yamagishi Kazutoshi
2022-02-14Fix admin statuses page order with media (#17538)Jeong Arm
2022-02-14Add `from:` query operator to search syntax (#16526)Jeong Arm
* Add 'by:userhandle' parameter to search api * Use search syntax for "by" prefix * Codeclimate * Use 'from' instead of 'by'
2022-02-13Bump kt-paperclip from 7.0.1 to 7.1.1 (#17502)dependabot[bot]
Bumps [kt-paperclip](https://github.com/kreeti/kt-paperclip) from 7.0.1 to 7.1.1. - [Release notes](https://github.com/kreeti/kt-paperclip/releases) - [Changelog](https://github.com/kreeti/kt-paperclip/blob/master/NEWS) - [Commits](https://github.com/kreeti/kt-paperclip/compare/v7.0.1...v7.1.1) --- updated-dependencies: - dependency-name: kt-paperclip dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-13Fix privacy policy link not being visible on small screens (#17533)Eugen Rochko
Fix #17482
2022-02-13Fix duplicate accounts when searching by IP range in admin UI (#17524)Eugen Rochko
2022-02-13Bump strong_migrations from 0.7.9 to 0.8.0 (#17504)dependabot[bot]
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.9 to 0.8.0. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.9...v0.8.0) --- updated-dependencies: - dependency-name: strong_migrations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-13Bump annotate from 3.1.1 to 3.2.0 (#17503)dependabot[bot]
Bumps [annotate](https://github.com/ctran/annotate_models) from 3.1.1 to 3.2.0. - [Release notes](https://github.com/ctran/annotate_models/releases) - [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ctran/annotate_models/compare/v3.1.1...v3.2.0) --- updated-dependencies: - dependency-name: annotate dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-13Bump rspec-rails from 5.0.2 to 5.1.0 (#17406)dependabot[bot]
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 5.0.2 to 5.1.0. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v5.0.2...v5.1.0) --- updated-dependencies: - dependency-name: rspec-rails dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-12Merge pull request #1691 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-02-12[Glitch] Fix controls for unchangeable properties on status edit not being ↵Claire
disabled Port 38845592c4b4456b5b407bd320249613a0f16e13 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-12Merge branch 'main' into glitch-soc/merge-upstreamClaire
generated by cgit-pink (git 2.37.1) at 2024-11-09 16:11:19 +0000