about summary refs log tree commit diff
path: root/.circleci
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-10-26 20:36:49 +0200
committerThibaut Girka <thib@sitedethib.com>2018-10-26 20:41:43 +0200
commit5bb8563f6c0ec9021d6e70d85544147e6c2d0f44 (patch)
tree96a939def53ee44f19d28c66f1d1f2195806ccc2 /.circleci
parent0e8de56a22aee089da8aa1c64bab941bc5911e5d (diff)
parent82e7988afcde5b19b99ad9ecf7973560a8a17f7f (diff)
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.
Diffstat (limited to '.circleci')
-rw-r--r--.circleci/config.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1b7f1db42..4d2ebf00a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,8 +13,8 @@ aliases:
           ALLOW_NOPAM: true
           CONTINUOUS_INTEGRATION: true
           DISABLE_SIMPLECOV: true
-          PAM_ENABLED: true	
-          PAM_DEFAULT_SERVICE: pam_test	
+          PAM_ENABLED: true
+          PAM_DEFAULT_SERVICE: pam_test
           PAM_CONTROLLED_SERVICE: pam_test_controlled
     working_directory: ~/projects/mastodon/
 
@@ -178,6 +178,8 @@ jobs:
       - *attach_workspace
       - run: bundle exec i18n-tasks check-normalized
       - run: bundle exec i18n-tasks unused
+      - run: bundle exec i18n-tasks missing-plural-keys
+      - run: bundle exec i18n-tasks check-consistent-interpolations
 
 workflows:
   version: 2