activeadmin 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27d6666a21998778549c84482d06084a12eba6df461f4183215d34a47188fc09
-  data.tar.gz: d1986d700254bf17ff146e04e3a4ded4a76685fb3a1f9eb3abfde12252c4551e
+  metadata.gz: e70a90d683c4af1876248495c8c055e9eb21669bac351b42dcdeb175f9003c62
+  data.tar.gz: 9f8029a8686ff5dd00932a248f620b1481c1d493f4d10594dc4549de07d269a8
 SHA512:
-  metadata.gz: eaefb8c2b8866055feb7bab79b6be4708f3b8fcf678aee9c38e7df868b97c0e8d14dcbcadc7b400a8fbb9ab866e49a6524972dc02f017e86ec4122407b90e311
-  data.tar.gz: 50f15d8ef7589802b84538579299d973d6822c8b4052a948a4b237859c1fa7f70ddbb9703c257ccdba910c73efefc775804d55e1ee3256cf9f6685fd1ed26333
+  metadata.gz: cdd5161de2dd77f1a01d4eae59f09c16c2f1aa356142a1add9fa7cfe8516bdff1676ebf98d0162c6ec736d0bdfaaba6a4f86b73664c734ac54b54a82d2808cd0
+  data.tar.gz: 4da12f46a43f27af9d4301520dfd337f31efe340890c8b255a0f11e92015996395d9a1f135a7f8a0f34534de493570ff065bff339b5e621837a06dcaf8985064

data/CHANGELOG.md

@@ -2,7 +2,22 @@
 
 ## Unreleased
 
-## 2.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.1.0..v2.0.0)
+## 2.2.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.1.0..v2.2.0)
+
+### Enhancements
+
+#### Minor
+
+* The `status_tag` component now supports different labels for `false` and `nil` boolean cases through the locale. Both default to display "No" for backwards compatibility. [#5794] by [@javierjulio]
+* Add Macedonian locale. [#5710] by [@violeta-p]
+
+### Bug Fixes
+
+* Fix pundit policy retrieving for static pages when the pundit namespace is :active_admin. [#5777] by [@kwent]
+* Fix show page title not being properly escaped if title's content included HTML. [#5802] by [@deivid-rodriguez]
+* Revert [21b6138f] from [#5740] since it actually caused the performance in development to regress. [#5801] by [@deivid-rodriguez]
+
+## 2.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.0.0..v2.1.0)
 
 ### Bug Fixes
 
@@ -355,6 +370,8 @@ Please check [0-6-stable] for previous changes.
 [#5043]: https://github.com/activeadmin/activeadmin/issues/5043
 [#5198]: https://github.com/activeadmin/activeadmin/issues/5198
 
+[21b6138f]: https://github.com/activeadmin/activeadmin/pull/5740/commits/21b6138fdcf58cd54c3f1d3f60cb1127b174b40f
+
 [#3091]: https://github.com/activeadmin/activeadmin/pull/3091
 [#3435]: https://github.com/activeadmin/activeadmin/pull/3435
 [#4477]: https://github.com/activeadmin/activeadmin/pull/4477
@@ -449,11 +466,16 @@ Please check [0-6-stable] for previous changes.
 [#5650]: https://github.com/activeadmin/activeadmin/pull/5650
 [#5590]: https://github.com/activeadmin/activeadmin/pull/5590
 [#5662]: https://github.com/activeadmin/activeadmin/pull/5662
+[#5710]: https://github.com/activeadmin/activeadmin/pull/5710
 [#5726]: https://github.com/activeadmin/activeadmin/pull/5726
 [#5738]: https://github.com/activeadmin/activeadmin/pull/5738
 [#5740]: https://github.com/activeadmin/activeadmin/pull/5740
 [#5751]: https://github.com/activeadmin/activeadmin/pull/5751
 [#5758]: https://github.com/activeadmin/activeadmin/pull/5758
+[#5777]: https://github.com/activeadmin/activeadmin/pull/5777
+[#5794]: https://github.com/activeadmin/activeadmin/pull/5794
+[#5801]: https://github.com/activeadmin/activeadmin/pull/5801
+[#5802]: https://github.com/activeadmin/activeadmin/pull/5802
 
 [@5t111111]: https://github.com/5t111111
 [@aarek]: https://github.com/aarek
@@ -490,6 +512,7 @@ Please check [0-6-stable] for previous changes.
 [@johnnyshields]: https://github.com/johnnyshields
 [@kjeldahl]: https://github.com/kjeldahl
 [@kobeumut]: https://github.com/kobeumut
+[@kwent]: https://github.com/kwent
 [@leio10]: https://github.com/leio10
 [@markstory]: https://github.com/markstory
 [@mauriciopasquier]: https://github.com/mauriciopasquier
@@ -520,3 +543,4 @@ Please check [0-6-stable] for previous changes.
 [@bartoszkopinski]: https://github.com/bartoszkopinski
 [@panasyuk]: https://github.com/panasyuk
 [@jscheid]: https://github.com/jscheid
+[@violeta-p]: https://github.com/violeta-p

data/config/locales/ar.yml

@@ -37,8 +37,9 @@ ar:
       current_filters: "المُرشحات الحاليّة:"
       no_current_filters: "بدون"
     status_tag:
-      'yes': "نعم"
-      'no': "لا"
+      "yes": "نعم"
+      "no": "لا"
+      "unset": "لا"
     main_content: "الرجاء تنفيذ %{model}#main_content لعرض المحتوى."
     logout: "تسجيل الخروج"
     powered_by: "تنفيذ %{active_admin} %{version}"

data/config/locales/bg.yml

@@ -34,6 +34,7 @@ bg:
     status_tag:
       "yes": "Да"
       "no": "не"
+      "unset": "не"
     main_content: "Добавете %{model}#main_content за да видите съдържание."
     logout: "Изход"
     powered_by: "Задвижва се от %{active_admin} %{version}"

data/config/locales/bs.yml

@@ -34,6 +34,7 @@ bs:
     status_tag:
       "yes": "Da"
       "no": "Nema"
+      "unset": "Nema"
     main_content: "Molim Vas, implementirajte %{model}#main_content da biste prikazali sadržaj."
     logout: "Odjavi se"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/ca.yml

@@ -35,6 +35,7 @@ ca:
     status_tag:
       "yes": "Sí"
       "no": "No"
+      "unset": "No"
     main_content: "Implementa %{model}#main_content per mostrar contingut."
     logout: "Desconnecta't"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/cs.yml

@@ -34,6 +34,7 @@ cs:
     status_tag:
       "yes": "Ano"
       "no": "Ne"
+      "unset": "Ne"
     main_content: "Implementujte prosím %{model}#main_content pro zobrazení obsahu."
     logout: "Odhlásit"
     powered_by: "%{active_admin} %{version}"

data/config/locales/da.yml

@@ -40,6 +40,7 @@ da:
     status_tag:
       "yes": "Ja"
       "no": "Nej"
+      "unset": "Nej"
     main_content: "Implementer venligst %{model}#main_content for at vise noget indhold."
     logout: "Log ud"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/de-CH.yml

@@ -34,6 +34,7 @@
     status_tag:
       "yes": "Ja"
       "no": "Nicht"
+      "unset": "Nicht"
     main_content: "Bitte implementieren Sie %{model}#main_content, um Inhalte anzuzeigen."
     logout: "Abmelden"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/de.yml

@@ -45,6 +45,7 @@ de:
     status_tag:
       "yes": "Ja"
       "no": "Nein"
+      "unset": "Nein"
     main_content: "Bitte implementieren Sie %{model}#main_content, um Inhalte anzuzeigen."
     logout: "Abmelden"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/el.yml

@@ -34,6 +34,7 @@ el:
     status_tag:
       "yes": "Ναι"
       "no": "Όχι"
+      "unset": "Όχι"
     main_content: "Παρακαλώ υλοποιήστε την %{model}#main_content για να εμφανίσετε περιεχόμενο."
     logout: "Αποσύνδεση"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/en-CA.yml

@@ -40,6 +40,7 @@
     status_tag:
       "yes": "Yes"
       "no": "No"
+      "unset": "No"
     main_content: "Please implement %{model}#main_content to display content."
     logout: "Logout"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/en-GB.yml

@@ -40,6 +40,7 @@
     status_tag:
       "yes": "Yes"
       "no": "No"
+      "unset": "No"
     main_content: "Please implement %{model}#main_content to display content."
     logout: "Logout"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/en.yml

@@ -63,6 +63,7 @@ en:
     status_tag:
       "yes": "Yes"
       "no": "No"
+      "unset": "No"
     main_content: "Please implement %{model}#main_content to display content."
     logout: "Logout"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/eo.yml

@@ -45,6 +45,7 @@ eo:
     status_tag:
       "yes": "Jes"
       "no": "Ne"
+      "unset": "Ne"
     main_content: "Aldonu %{model}#main_content por montri la enhavon."
     logout: "Elsaluti"
     powered_by: "Povigita de %{active_admin} %{version}"

data/config/locales/es-MX.yml

@@ -34,6 +34,7 @@ es-MX:
     status_tag:
       "yes": "Sí"
       "no": "No"
+      "unset": "No"
     main_content: "Por favor implemente %{model}#main_content para mostrar contenido."
     logout: "Salir"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/es.yml

@@ -63,6 +63,7 @@ es:
     status_tag:
       "yes": "Sí"
       "no": "No"
+      "unset": "No"
     main_content: "Por favor implemente %{model}#main_content para mostrar contenido."
     logout: "Salir"
     powered_by: "Funciona con %{active_admin} %{version}"

data/config/locales/fa.yml

@@ -34,6 +34,7 @@ fa:
     status_tag:
       "yes": "بله"
       "no": "بدون"
+      "unset": "بدون"
     main_content: "لطفا %{model}#main_content را پیاده سازی کنید تا محتوی نمایش داده شود."
     logout: "خروج"
     powered_by: "قدرت گرفته از %{active_admin} %{version}"

data/config/locales/fi.yml

@@ -34,6 +34,7 @@ fi:
     status_tag:
       "yes": "Kyllä"
       "no": "Ei"
+      "unset": "Ei"
     main_content: "Ole hyvä, käytä %{model}#main_content:ia nähdäksesi jotain."
     logout: "Kirjaudu ulos"
     powered_by: "Käyttää %{active_admin} %{version}:ia"

data/config/locales/fr.yml

@@ -18,7 +18,7 @@ fr:
     previous: "Précédent"
     next: "Suivant"
     download: "Télécharger :"
-    has_many_new: "Ajouter un nouveau %{model}"
+    has_many_new: "Ajouter un(e) %{model}"
     has_many_delete: "Supprimer"
     has_many_remove: "Enlever"
     filters:
@@ -44,6 +44,7 @@ fr:
     status_tag:
       "yes": "Oui"
       "no": "Non"
+      "unset": "Non"
     main_content: "Veuillez implémenter %{model}#main_content pour afficher le contenu."
     logout: "Déconnexion"
     powered_by: "Propulsé par %{active_admin} %{version}"

data/config/locales/he.yml

@@ -42,6 +42,7 @@ he:
     status_tag:
       "yes": "כן"
       "no": "לא"
+      "unset": "לא"
     main_content: "אנא הטמע את %{model}#main_content בכדי להציג תוכן."
     logout: "התנתקות"
     powered_by: "ממונע בעזרת %{active_admin} %{version}"

data/config/locales/hr.yml

@@ -34,6 +34,7 @@ hr:
     status_tag:
       "yes": "Da"
       "no": "Nema"
+      "unset": "Nema"
     main_content: "Molim Vas, implementirajte %{model}#main_content da biste prikazali sadržaj."
     logout: "Odjavi se"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/hu.yml

@@ -38,6 +38,7 @@ hu:
     status_tag:
       "yes": "Igen"
       "no": "Nem"
+      "unset": "Nem"
     main_content: "Kérem, implementálja a %{model}#main_content metódust a tartalom megjelenítéséhez."
     logout: "Kilépés"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/id.yml

@@ -39,6 +39,7 @@ id:
     status_tag:
       "yes": "Ya"
       "no": "Tidak"
+      "unset": "Tidak"
     main_content: "Harap mengimplementasikan %{model}#main_content untuk menampilkan konten."
     logout: "Keluar"
     powered_by: "Dibuat dengan %{active_admin} %{version}"

data/config/locales/it.yml

@@ -45,6 +45,7 @@ it:
     status_tag:
       "yes": "Sì"
       "no": "No"
+      "unset": "No"
     main_content: "Devi implemetare %{model}#main_content per mostrarne il contenuto."
     logout: "Esci"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/ja.yml

@@ -44,6 +44,7 @@ ja:
     status_tag:
       "yes": "はい"
       "no": "いいえ"
+      "unset": "いいえ"
     main_content: "内容を表示するために %{model}#main_content を実装してください。"
     logout: "ログアウト"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/ko.yml

@@ -39,6 +39,7 @@ ko:
     status_tag:
       "yes": "있음"
       "no": "없음"
+      "unset": "없음"
     main_content: "내용을 보시려면 %{model}#main_content의 코드를 먼저 구현해 주시기 바랍니다."
     logout: "로그아웃"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/lt.yml

@@ -43,6 +43,7 @@ lt:
     status_tag:
       "yes": "Taip"
       "no": "Nėra"
+      "unset": "Nėra"
     main_content: 'Prašome realizuoti %{model}#main_content turiniui vaizduoti.'
     logout: 'Išeiti'
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/lv.yml

@@ -34,6 +34,7 @@ lv:
     status_tag:
       "yes": "Jā"
       "no": "Nē"
+      "unset": "Nē"
     main_content: "Lūdzu implementēt %{model}#main_content, lai rādītos saturs."
     logout: "Iziet"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/mk.yml

@@ -0,0 +1,134 @@
+mk:
+  activerecord:
+    models:
+      comment:
+        one: "Коментар"
+        other: "Коментари"
+      active_admin/comment:
+        one: "Коментар"
+        other: "Коментари"
+  active_admin:
+    dashboard: "Почетна"
+    dashboard_welcome:
+      welcome: "Добредојдовте во Active Admin. Ова е стандардна верзија на почетната страна."
+      call_to_action: "За да додадете секции на почетната страна, прегледајте го 'app/admin/dashboard.rb'."
+    view: "Прегледај"
+    edit: "Измени"
+    delete: "Избриши"
+    delete_confirmation: "Дали сте сигурни дека сакате да го избришете записот?"
+    create_another: "Креирај нов %{model}"
+    new_model: "Додај нов %{model}"
+    edit_model: "Измени %{model}"
+    delete_model: "Избриши %{model}"
+    details: "Детали за %{model}"
+    cancel: "Откажи"
+    empty: "Празно"
+    previous: "Претходно"
+    next: "Следно"
+    download: "Преземи во понудените формати:"
+    has_many_new: "Додај нов %{model}"
+    has_many_delete: "Избриши"
+    has_many_remove: "Отстрани"
+    move: "Премести"
+    filters:
+      buttons:
+        filter: "Пребарај"
+        clear: "Исчисти филтри"
+      predicates:
+        contains: "Содржи"
+        equals: "Е еднакво со"
+        starts_with: "Започнува со"
+        ends_with: "Завршува сo"
+        greater_than: "Е поголемо од"
+        less_than: "Е помало од"
+        gteq_datetime: "Е поголемо или еднакво со"
+        lteq_datetime: "Е помало или еднакво со"
+        from: "Од"
+        to: "До"
+    search_status:
+      headline: "Пронајдени резултати:"
+      current_filters: "Резултати врз основа на следниве филтри:"
+      no_current_filters: "Моментално нема филтри"
+    status_tag:
+      "yes": "Да"
+      "no": "Не"
+      "unset": "Не"
+    main_content: "Ве замолуваме имплементирајте %{model}#main_content за да прикажете содржина."
+    logout: "Одјави се"
+    powered_by: "Овозможено од %{active_admin} %{version}"
+    sidebars:
+      filters: "Филтри за пребарување"
+      search_status: "Резултати од пребарување"
+    pagination:
+      empty: "Нема пронајдени записи за %{model}"
+      one: "Прикажан <b>1</b> %{model}"
+      one_page: "Прикажани <b>сите %{n}</b> %{model}"
+      multiple: "Прикажани %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> од вкупно <b>%{total}</b>"
+      multiple_without_total: "Прикажани %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>"
+      per_page: "Прикази на записи по страна:"
+      entry:
+        one: "запис"
+        other: "записи"
+    any: "Било кој"
+    blank_slate:
+      content: "Не се креирани записи од типот на %{resource_name}."
+      link: "Креирај нов"
+    dropdown_actions:
+      button_label: "Активности"
+    batch_actions:
+      button_label: "Групни активности"
+      default_confirmation: "Дали сте сигурни?"
+      delete_confirmation: "Дали сте сигурни дека сакате да ги избришете %{plural_model}?"
+      succesfully_destroyed:
+        one: "Успешно е избришан 1 %{model}"
+        other: "Успешно се избришани %{count} %{plural_model}"
+      selection_toggle_explanation: "(Toggle Selection)"
+      action_label: "%{title} го селектираното"
+      labels:
+        destroy: "Избриши"
+    devise:
+      username:
+        title: "Корисничко име"
+      email:
+        title: "Е-маил"
+      password:
+        title: "Лозинка"
+      password_confirmation:
+        title: "Потврди Лозинка"
+      sign_up:
+        title: "Креирај профил"
+        submit: "Креирај"
+      login:
+        title: "Најави се"
+        remember_me: "Запомни ме"
+        submit: "Најави се"
+      reset_password:
+        title: "Ја заборавивте Вашата лозинка?"
+        submit: "Промени лозинка"
+      change_password:
+        title: "Променете ја лозинката"
+        submit: "Промени лозинка"
+      unlock:
+        title: "Повторно испраќање на инструкции за отклучување на профил"
+        submit: "Испрати инструкции"
+      resend_confirmation_instructions:
+        title: "Повторно испраќање на инструкции за потврдување на профил"
+        submit: "Инспрати инструкции"
+      links:
+        sign_up: "Креирај профил"
+        sign_in: "Најави се"
+        forgot_your_password: "Ја заборавивте Вашата лозинка?"
+        sign_in_with_omniauth_provider: "Најави се со %{provider}"
+        resend_unlock_instructions: "Повторно испрати инструкции за отклучување на профил"
+        resend_confirmation_instructions: "Повторно испрати инструкции за потврдување на профил"
+    unsupported_browser:
+      headline: "Ве замолуваме, имајте во предвид дека ActiveAdmin не нуди поддршка за Internet Explorer 8 верзијата или претходни верзии."
+      recommendation: "Ви порачуваме да го <a href=\"http://browsehappy.com/\"> ажурирате Вашиот пребарувач</a> за да си го подобрите пребарувањето."
+      turn_off_compatibility_view: "Доколку користите IE 9 или понова верзија, Ве замолуваме <a href=\"https://support.microsoft.com/en-us/help/17471\">да исклучите \"Compatibility View\"</a>."
+    access_denied:
+      message: "Немате овластување да ја извршите оваа активност."
+    index_list:
+      table: "Табела"
+      block: "Листа"
+      grid: "Грид"
+      blog: "Блог"

data/config/locales/nb.yml

@@ -43,6 +43,7 @@ nb:
     status_tag:
       "yes": "Ja"
       "no": "Nei"
+      "unset": "Nei"
     main_content: "Vennligst implementer %{model}#main_content for å vise innhold."
     logout: "Logg ut"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/nl.yml

@@ -45,6 +45,7 @@ nl:
     status_tag:
       "yes": "Ja"
       "no": "Geen"
+      "unset": "Geen"
     main_content: "Implementeer %{model}#main_content om de content weer te geven."
     logout: "Uitloggen"
     powered_by: "Mogelijk gemaakt door %{active_admin} %{version}"

data/config/locales/pl.yml

@@ -67,6 +67,7 @@ pl:
     status_tag:
       "yes": "Tak"
       "no": "Nie"
+      "unset": "Nie"
     main_content: "Zaimplementuj %{model}#main_content aby wyświetlić treść."
     logout: "Wyloguj"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/pt-BR.yml

@@ -44,6 +44,7 @@ pt-BR:
     status_tag:
       "yes": "Sim"
       "no": "Não"
+      "unset": "Não"
     main_content: "Por favor implemente %{model}#main_content para exibir conteúdo."
     logout: "Sair"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/pt-PT.yml

@@ -34,6 +34,7 @@
     status_tag:
       "yes": "Sim"
       "no": "Não"
+      "unset": "Não"
     main_content: "Por favor implemente %{model}#main_content para mostrar o conteúdo."
     logout: "Sair"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/ro.yml

@@ -34,6 +34,7 @@ ro:
     status_tag:
       "yes": "Da"
       "no": "Nu"
+      "unset": "Nu"
     main_content: "Va rugam sa implementati %{model}#main_content pentru a afisa continut."
     logout: "Iesire"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/ru.yml

@@ -41,6 +41,7 @@ ru:
     status_tag:
       "yes": "Да"
       "no": "Нет"
+      "unset": "Нет"
     main_content: "Создайте %{model}#main_content для отображения содержимого."
     logout: "Выйти"
     powered_by: "Работает на %{active_admin} %{version}"

data/config/locales/sk.yml

@@ -34,6 +34,7 @@ sk:
     status_tag:
       "yes": "Áno"
       "no": "Nie"
+      "unset": "Nie"
     main_content: "Implementujte prosím %{model}#main_content pre zobrazenie obsahu."
     logout: "Odhlásiť"
     powered_by: "%{active_admin} %{version}"

data/config/locales/sv-SE.yml

@@ -41,6 +41,7 @@
     status_tag:
       "yes": "Ja"
       "no": "Nej"
+      "unset": "Nej"
     main_content: "Implementera %{model}#main_content för att kunna visa något."
     logout: "Logga ut"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/tr.yml

@@ -45,6 +45,7 @@ tr:
     status_tag:
       "yes": "Evet"
       "no": "Hayır"
+      "unset": "Hayır"
     main_content: "İçeriği görüntülemek için lütfen %{model}#main_content metodunu ekleyin."
     logout: "Çıkış Yap"
     powered_by: "%{active_admin} %{version} tarafından desteklenmektedir."

data/config/locales/uk.yml

@@ -41,6 +41,7 @@ uk:
     status_tag:
       "yes": "Так"
       "no": "Ні"
+      "unset": "Ні"
     main_content: "Створіть %{model}#main_content для відображення вмісту."
     logout: "Вийти"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/vi.yml

@@ -43,6 +43,7 @@ vi:
     status_tag:
       "yes": "Có"
       "no": "Không Có"
+      "unset": "Không Có"
     main_content: "Xin bổ sung %{model}#main_content để hiển thị nội dung."
     logout: "Đăng xuất"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/zh-CN.yml

@@ -44,6 +44,7 @@
     status_tag:
       "yes": "是"
       "no": "否"
+      "unset": "否"
     main_content: "请执行 %{model}#main_content 来显示内容."
     logout: "退出"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/zh-TW.yml

@@ -39,6 +39,7 @@
     status_tag:
       "yes": "是"
       "no": "否"
+      "unset": "否"
     main_content: "請實作 %{model}#main_content 以顯示內容。"
     logout: "登出"
     powered_by: "Powered by %{active_admin} %{version}"

data/docs/12-arbre-components.md

@@ -177,6 +177,19 @@ status_tag 'active', class: 'important', id: 'status_123', label: 'on'
 # => <span class='status_tag active important' id='status_123'>on</span>
 ```
 
+When providing a `true` or `false` value, the `status_tag` will display "Yes"
+or "No". This can be configured through the `"en.active_admin.status_tag"`
+locale.
+
+```ruby
+status_tag true
+# => <span class='status_tag yes'>Yes</span>
+```
+
+In the case that a boolean field is `nil`, it will display "No" as a default.
+But using the `"en.active_admin.status_tag.unset"` locale key, it can be
+configured to display something else.
+
 ## Tabs
 
 The Tabs component is helpful for saving page real estate. The first tab will be

data/docs/13-authorization-adapter.md

@@ -244,7 +244,7 @@ To view more details about the API's, visit project pages of
 ## Using the Pundit Adapter
 
 Active Admin also provides an adapter out of the box for
-[Pundit](https://github.com/elabs/pundit).
+[Pundit](https://github.com/varvet/pundit).
 
 To use the Pundit adapter, update the configuration in the Active Admin
 initializer:
@@ -255,7 +255,7 @@ config.authorization_adapter = ActiveAdmin::PunditAdapter
 
 Once that's done, Active Admin will pick up your Pundit policies, and use
 them for authorization. For more information about setting up Pundit, see
-[their documention](https://github.com/elabs/pundit#installation).
+[their documentation](https://github.com/varvet/pundit#installation).
 
 Pundit also has [verify_authorized and/or verify_policy_scoped
 methods](https://github.com/varvet/pundit#ensuring-policies-and-scopes-are-used)

data/lib/active_admin/application.rb

@@ -187,8 +187,17 @@ module ActiveAdmin
     # regenerate the routes as well.
     def attach_reloader
       Rails.application.config.after_initialize do |app|
-        ActiveSupport::Reloader.after_class_unload do
-          ActiveAdmin.application.unload!
+        unload_active_admin = -> { ActiveAdmin.application.unload! }
+
+        if app.config.reload_classes_only_on_change
+          # Rails is about to unload all the app files (e.g. models), so we
+          # should first unload the classes generated by Active Admin, otherwise
+          # they will contain references to the stale (unloaded) classes.
+          ActiveSupport::Reloader.to_prepare(prepend: true, &unload_active_admin)
+        else
+          # If the user has configured the app to always reload app files after
+          # each request, so we should unload the generated classes too.
+          ActiveSupport::Reloader.to_complete(&unload_active_admin)
         end
 
         admin_dirs = {}

data/lib/active_admin/batch_actions/resource_extension.rb

@@ -112,7 +112,11 @@ module ActiveAdmin
     # => You can pass a hash of options to `:form` that will be rendered as form input fields for the user to fill out.
     #
     def initialize(sym, title, options = {}, &block)
-      @sym, @title, @options, @block, @confirm = sym, title, options, block, options[:confirm]
+      @sym = sym
+      @title = title
+      @options = options
+      @block = block
+      @confirm = options[:confirm]
       @block ||= proc {}
     end
 

data/lib/active_admin/controller_action.rb

@@ -2,7 +2,8 @@ module ActiveAdmin
   class ControllerAction
     attr_reader :name
     def initialize(name, options = {})
-      @name, @options = name, options
+      @name = name
+      @options = options
     end
 
     def http_verb

data/lib/active_admin/csv_builder.rb

@@ -32,7 +32,9 @@ module ActiveAdmin
 
     def initialize(options = {}, &block)
       @resource = options.delete(:resource)
-      @columns, @options, @block = [], options, block
+      @columns = []
+      @options = options
+      @block = block
     end
 
     def column(name, options = {}, &block)

data/lib/active_admin/dependency.rb

@@ -55,10 +55,6 @@ module ActiveAdmin
       Matcher.new name.to_s
     end
 
-    def self.rails_version
-      rails.spec.version
-    end
-
     def self.supports_zeitwerk?
       rails >= "6.0.0.beta3" && RUBY_ENGINE != "jruby"
     end

data/lib/active_admin/error.rb

@@ -6,7 +6,9 @@ module ActiveAdmin
     attr_reader :user, :action, :subject
 
     def initialize(user, action, subject = nil)
-      @user, @action, @subject = user, action, subject
+      @user = user
+      @action = action
+      @subject = subject
 
       super()
     end

data/lib/active_admin/filters/active_filter.rb

@@ -26,8 +26,7 @@ module ActiveAdmin
       end
 
       def label
-        # TODO: to remind us to go back to the simpler str.downcase once we support ruby >= 2.4 only.
-        translated_predicate = predicate_name.mb_chars.downcase.to_s
+        translated_predicate = predicate_name.downcase
         if filter_label && filter_label.is_a?(Proc)
           "#{filter_label.call} #{translated_predicate}"
         elsif filter_label
@@ -67,7 +66,7 @@ module ActiveAdmin
       def filter_label
         return unless filter
 
-        filter[:label]
+        filter[:label] || I18n.t(name, scope: ['formtastic', 'labels'], default: nil)
       end
 
       #@return Ransack::Nodes::Attribute

data/lib/active_admin/page_presenter.rb

@@ -21,7 +21,8 @@ module ActiveAdmin
     delegate :has_key?, :fetch, to: :options
 
     def initialize(options = {}, &block)
-      @options, @block = options, block
+      @options = options
+      @block = block
     end
 
     def [](key)

data/lib/active_admin/pundit_adapter.rb

@@ -44,7 +44,7 @@ module ActiveAdmin
     end
 
     def format_action(action, subject)
-      # https://github.com/elabs/pundit/blob/master/lib/generators/pundit/install/templates/application_policy.rb
+      # https://github.com/varvet/pundit/blob/master/lib/generators/pundit/install/templates/application_policy.rb
       case action
       when Auth::CREATE  then :create?
       when Auth::UPDATE  then :update?
@@ -57,8 +57,8 @@ module ActiveAdmin
     private
 
     def namespace(object)
-      if ActiveAdmin.application.pundit_policy_namespace
-        [ActiveAdmin.application.pundit_policy_namespace.to_sym, object]
+      if default_policy_namespace && !object.class.to_s.include?(default_policy_namespace.to_s.camelize)
+        [default_policy_namespace.to_sym, object]
       else
         object
       end
@@ -72,6 +72,10 @@ module ActiveAdmin
       default_policy_class.new(user, subject)
     end
 
+    def default_policy_namespace
+      ActiveAdmin.application.pundit_policy_namespace
+    end
+
   end
 
 end

data/lib/active_admin/resource.rb

@@ -71,7 +71,8 @@ module ActiveAdmin
         @resource_class_name = "::#{resource_class.name}"
         @options    = options
         @sort_order = options[:sort_order]
-        @member_actions, @collection_actions = [], []
+        @member_actions = []
+        @collection_actions = []
       end
     end
 

data/lib/active_admin/resource/belongs_to.rb

@@ -15,7 +15,9 @@ module ActiveAdmin
       attr_reader :owner
 
       def initialize(owner, target_name, options = {})
-        @owner, @target_name, @options = owner, target_name, options
+        @owner = owner
+        @target_name = target_name
+        @options = options
       end
 
       # Returns the target resource class or raises an exception if it doesn't exist

data/lib/active_admin/router.rb

@@ -4,7 +4,8 @@ module ActiveAdmin
     attr_reader :namespaces, :router
 
     def initialize(router:, namespaces:)
-      @router, @namespaces = router, namespaces
+      @router = router
+      @namespaces = namespaces
     end
 
     def apply

data/lib/active_admin/scope.rb

@@ -28,7 +28,8 @@ module ActiveAdmin
     #   # => Scope with the group :status
     #
     def initialize(name, method = nil, options = {}, &block)
-      @name, @scope_method = name, method.try(:to_sym)
+      @name = name
+      @scope_method = method.try(:to_sym)
 
       if name.is_a? Proc
         raise "A string/symbol is required as the second argument if your label is a proc." unless method
@@ -38,8 +39,11 @@ module ActiveAdmin
         @id = name.to_s.parameterize(separator: "_")
       end
 
-      @scope_method               = nil        if @scope_method == :all
-      @scope_method, @scope_block = nil, block if block_given?
+      @scope_method = nil if @scope_method == :all
+      if block_given?
+        @scope_method = nil
+        @scope_block = block
+      end
 
       @localizer        = options[:localizer]
       @show_count       = options.fetch(:show_count, true)

data/lib/active_admin/sidebar_section.rb

@@ -6,7 +6,9 @@ module ActiveAdmin
     attr_accessor :name, :options, :block
 
     def initialize(name, options = {}, &block)
-      @name, @options, @block = name.to_s, options, block
+      @name = name.to_s
+      @options = options
+      @block = block
       normalize_display_options!
     end
 

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/lib/active_admin/view_helpers/breadcrumb_helper.rb

@@ -12,9 +12,9 @@ module ActiveAdmin
           # 1. try using `display_name` if we can locate a DB object
           # 2. try using the model name translation
           # 3. default to calling `titlecase` on the URL fragment
-          if part =~ /\A(\d+|[a-f0-9]{24}|(?:[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}))\z/ && parts[index-1]
+          if part =~ /\A(\d+|[a-f0-9]{24}|(?:[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}))\z/ && parts[index - 1]
             parent = active_admin_config.belongs_to_config.try :target
-            config = parent && parent.resource_name.route_key == parts[index-1] ? parent : active_admin_config
+            config = parent && parent.resource_name.route_key == parts[index - 1] ? parent : active_admin_config
             name   = display_name config.find_resource part
           end
           name ||= I18n.t "activerecord.models.#{part.singularize}", count: ::ActiveAdmin::Helpers::I18n::PLURAL_MANY_COUNT, default: part.titlecase

data/lib/active_admin/view_helpers/display_helper.rb

@@ -3,7 +3,8 @@ module ActiveAdmin
     module DisplayHelper
 
       DISPLAY_NAME_FALLBACK = -> {
-        name, klass = "", self.class
+        name = ""
+        klass = self.class
         name << klass.model_name.human         if klass.respond_to? :model_name
         name << " ##{send(klass.primary_key)}" if klass.respond_to? :primary_key
         name.present? ? name : to_s
@@ -15,7 +16,7 @@ module ActiveAdmin
       # Attempts to call any known display name methods on the resource.
       # See the setting in `application.rb` for the list of methods and their priority.
       def display_name(resource)
-        sanitize(render_in_context(resource, display_name_method_for(resource)).to_s) unless resource.nil?
+        ERB::Util.html_escape(render_in_context(resource, display_name_method_for(resource))) unless resource.nil?
       end
 
       # Looks up and caches the first available display name method.

data/lib/active_admin/views/components/status_tag.rb

@@ -51,8 +51,10 @@ module ActiveAdmin
         case status
         when true, 'true'
           'Yes'
-        when false, 'false', nil
+        when false, 'false'
           'No'
+        when nil
+          'Unset'
         else
           status
         end
@@ -60,6 +62,8 @@ module ActiveAdmin
 
       def status_to_class(status)
         case status
+        when 'Unset'
+          'unset no'
         when String, Symbol
           status.to_s.titleize.gsub(/\s/, '').underscore
         else

data/lib/generators/active_admin/resource/templates/admin.rb.erb

@@ -1,43 +1,44 @@
 ActiveAdmin.register <%= class_name %> do
-# See permitted parameters documentation:
-# https://github.com/activeadmin/activeadmin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters
-#
-# permit_params :list, :of, :attributes, :on, :model
-#
-# or
-#
-# permit_params do
-#   permitted = [:permitted, :attributes]
-#   permitted << :other if params[:action] == 'create' && current_user.admin?
-#   permitted
-# end
-<% if options.include_boilerplate? %>
-# Limit actions available to your users by adding them to the 'except' array
-# actions :all, except: []
 
-# Add or remove filters (you can use any ActiveRecord scope) to toggle their
-# visibility in the sidebar
-<%= @boilerplate.filters %>
+  # See permitted parameters documentation:
+  # https://github.com/activeadmin/activeadmin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters
+  #
+  # permit_params :list, :of, :attributes, :on, :model
+  #
+  # or
+  #
+  # permit_params do
+  #   permitted = [:permitted, :attributes]
+  #   permitted << :other if params[:action] == 'create' && current_user.admin?
+  #   permitted
+  # end
+  <% if options.include_boilerplate? %>
+  # Limit actions available to your users by adding them to the 'except' array
+  # actions :all, except: []
 
-# Add or remove columns to toggle their visiblity in the index action
-# index do
-#   selectable_column
-#   id_column
-<%= @boilerplate.columns %>
-#   actions
-# end
+  # Add or remove filters (you can use any ActiveRecord scope) to toggle their
+  # visibility in the sidebar
+  <%= @boilerplate.filters %>
 
-# Add or remove rows to toggle their visiblity in the show action
-# show do |<%= class_name.downcase %>|
-<%= @boilerplate.rows %>
-# end
+  # Add or remove columns to toggle their visiblity in the index action
+  # index do
+  #   selectable_column
+  #   id_column
+  <%= @boilerplate.columns %>
+  #   actions
+  # end
 
-# Add or remove fields to toggle their visibility in the form
-# form do |f|
-#   f.inputs do
-<%= @boilerplate.form_inputs %>
-#   end
-#   f.actions
-# end
-<% end %>
+  # Add or remove rows to toggle their visiblity in the show action
+  # show do |<%= class_name.downcase %>|
+  <%= @boilerplate.rows %>
+  # end
+
+  # Add or remove fields to toggle their visibility in the form
+  # form do |f|
+  #   f.inputs do
+  <%= @boilerplate.form_inputs %>
+  #   end
+  #   f.actions
+  # end
+  <% end %>
 end

data/lib/ransack_ext.rb

@@ -2,11 +2,11 @@
 # identically to the versions given in Ransack.
 #
 Ransack.configure do |config|
-  { 'contains'=>'cont', 'starts_with'=>'start', 'ends_with'=>'end' }.each do |old, current|
+  { 'contains' => 'cont', 'starts_with' => 'start', 'ends_with' => 'end' }.each do |old, current|
     config.add_predicate old, Ransack::Constants::DERIVED_PREDICATES.detect { |q, _| q == current }[1]
   end
 
-  { 'equals'=>'eq', 'greater_than'=>'gt', 'less_than'=>'lt' }.each do |old, current|
+  { 'equals' => 'eq', 'greater_than' => 'gt', 'less_than' => 'lt' }.each do |old, current|
     config.add_predicate old, arel_predicate: current
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -122,7 +122,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -331,6 +331,7 @@ files:
 - config/locales/ko.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
+- config/locales/mk.yml
 - config/locales/nb.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
@@ -606,7 +607,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style