1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-05 18:28:50 +09:00
Commit Graph

33 Commits

Author SHA1 Message Date
Thibaut Girka
6b999411fc Revert CircleCI and some webpack changes to match upstream 2019-11-20 18:05:24 +01:00
Thibaut Girka
f63dad5294 Change CircleCI config to build assets with NODE_ENV=test
This should avoid minimization and other expensive webpack
transformations which aren't useful for running tests.
2019-11-07 13:27:36 +01:00
Thibaut Girka
74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
Eugen Rochko
9361981388
Add missing locale file for ga and add rake task to check for it (#11813)
* Add missing locale file for ga and add rake task to check for it

* Update lib/tasks/repo.rake

Co-Authored-By: Yamagishi Kazutoshi <ykzts@desire.sh>

* Fix check-i18n build
2019-09-12 04:58:33 +02:00
Thibaut Girka
5088eb8388 Merge branch 'master' into glitch-soc/merge-upstream 2019-09-05 11:36:41 +02:00
Shlee
db28bb487b Pushed CircleCI docker images to more recent V (#11708) 2019-08-30 16:59:11 +02:00
Thibaut Girka
5717f75340 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-16 21:09:19 +02:00
Eugen Rochko
65efe892cf
Fix check-i18n builds (#11084)
* Fix check-i18n builds

* Remove check for missing plural forms
2019-06-16 19:12:12 +02:00
ThibG
eb3b9e22bd Fix CircleCI (#9695) 2019-01-02 20:48:22 +01:00
Thibaut Girka
63d673ea24 Fix CircleCI 2019-01-02 15:36:59 +01:00
Thibaut Girka
571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
2019-01-02 15:36:53 +01:00
ashleyhull-versent
29484f6555 Replace Ruby 2.3 with 2.6 in CircleCI (#9652)
* Update config.yml

* Update Gemfile

* dropping ruby 2.3

2.3 EOL date: scheduled for 2019-03-31

* Updating docker containers

* Update Gemfile
2018-12-29 07:23:07 +01:00
Thibaut Girka
b00f60f1d3 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-28 08:37:49 +01:00
Eugen Rochko
26fe37c414
Update i18n-tasks and change CircleCI command (#9104)
* Update i18n-tasks and CircleCI command

* Fix #9088

* Update i18n-tasks

* Fix ast
2018-10-28 07:15:20 +01:00
Thibaut Girka
5bb8563f6c Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/admin/base_controller.rb
- app/controllers/filters_controller.rb
- app/controllers/invites_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/javascript/packs/public.js
- app/views/settings/profiles/show.html.haml

Conflicts were mostly due to the addition of body classes to the settings page,
this was caused by rejecting upstream changes for most of those files and
modifying Settings::BaseController instead.

Another cause of conflicts was the deletion of client-side checking of
display name / bio length, this was modified in app/javascript/core/settings.js
instead.
2018-10-26 20:41:43 +02:00
Eugen Rochko
9b5348240e
Add consistent interpolations check to CircleCI (#9072)
* Add consistent interpolations check to CircleCI

* Fix locale strings using wrong variables
2018-10-25 01:17:01 +02:00
Eugen Rochko
df3a7e724d
Fix missing plural keys (#9084)
* Update i18n-tasks to feature-missing-plural-keys

* Fix pluralizations with missing keys in Arabic

Fix #8554

* Add i18n-tasks missing-plural-keys to CircleCI
2018-10-25 00:09:45 +02:00
Thibaut Girka
dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
2018-10-22 17:51:38 +02:00
takayamaki
33976c8ecc fix: Execute PAM authentication tests on CircleCI (#9029)
and use 'if' option of context block
2018-10-20 17:28:04 +02:00
Thibaut Girka
bfeac6747a Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	.circleci/config.yml
	app/controllers/authorize_follows_controller.rb
	app/javascript/packs/public.js

Moved new stuff from packs/public.js to core/public.js.
Added appropriate use_pack in new controllers.
2018-08-18 18:04:49 +02:00
ThibG
5059989cc7 Use CircleCI workflows for ruby dependencies (#8228)
* Add “bundle clean” suggestion from CircleCI doc

Cf. https://circleci.com/docs/2.0/caching/#bundler-ruby

* Use workspaces instead of caches for ruby gems

Cache are not guaranteed to be available, while the test jobs *require* their
depencies to run. Workspaces are thus more suitable.

One downside is that the order of workspace layer additions need to be
deterministic, which is why install-ruby{2.3,2.4} now depend on
install-ruby2.5.
2018-08-18 04:05:42 +02:00
Thibaut Girka
9d09c7cc68 Use workspace instead of caching for built assets
Tests cannot run without built assets, and we want
exactly the matching assets. This is not a cache.
2018-07-30 22:25:22 +02:00
ThibG
d425d30804 Use workspace instead of caching for built assets (#8103)
Tests cannot run without built assets, and we want
exactly the matching assets. This is not a cache.
2018-07-30 22:22:55 +02:00
Thibaut Girka
3fa9bf7cc2 Double CircleCI's timeout for assets:precompile… 2018-07-27 10:38:46 +02:00
Thibaut Girka
f328d20ff8 Increase timeout for assets:precompile 2018-07-18 21:20:30 +02:00
Renato "Lond" Cerqueira
4045b50bd6 Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935)
This replace calls of String#match? with rails Regex#match?
This follows the same idea used to keep Rails 5.2 compatible with Ruby
2.2.2 in https://github.com/rails/rails/pull/32973
2018-07-03 19:47:09 +02:00
Yamagishi Kazutoshi
1337ca837b Add CONTINUOUS_INTEGRATION: true to .circleci/config.yml (#7447) 2018-05-11 11:51:07 +02:00
Yamagishi Kazutoshi
ac788ad47e Disable simplecov on CircleCI (#7416)
* Disable simplecov on CircleCI

* Remove --format progress
2018-05-09 16:59:58 +02:00
Yamagishi Kazutoshi
8c35d163a5 Port travis_retry for CI (#7379)
* Port travis_retry for CI

* Add license
2018-05-06 10:55:50 +02:00
Yamagishi Kazutoshi
1c3ace23cb Remove unnecessary hyphen from restore_cache key (#7276) 2018-04-28 11:20:30 +02:00
Yamagishi Kazutoshi
3bf6da1ffc Move precompile step to build stage (#7235) 2018-04-23 09:16:26 +02:00
Yamagishi Kazutoshi
b8f0cfd6e3 Add parallel test processors (#7215) 2018-04-21 21:36:22 +02:00
Yamagishi Kazutoshi
6f63cbb53c Replace Travis to CircleCI (#7196) 2018-04-20 13:46:08 +02:00