activeadmin 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31e6adaf39f455cb8188d2982a201d9853a2976e9ae446dcc7958882a6f15422
-  data.tar.gz: 58b45a79713a68cf75a9e0bb13b7cfe90bf5bf1c01e403375de2acdd4ad16881
+  metadata.gz: 8ce87c19dbaccfc28fd5c36d12f1ef679772a70bd1ae8a131182d277d3de4cb3
+  data.tar.gz: d0b56716796cb013d8d874280366d8fb424366ee3979bf6549585ef505836d79
 SHA512:
-  metadata.gz: 2c633c0f35fb6a9a90677e8f13d1c7194c8ff3ec3e267ca9249fd0343f09a319ac15148e8067be5b483fb5feab8d6cc9213208ffc24609b233b3b3335d2ba3ca
-  data.tar.gz: 815d48181cbdcc9e36ea268217e320f3542a8791b659b931ca51a7a035d478e3cf00fb84f23e5e7021bc015bafd6c28b04add620a3414953ba32e65d8b7a9da3
+  metadata.gz: fcda92e560081295c175f08b876594a5bc3ea38cfcb523a15e803a086c97306574801d279ffc2f553902a4aaf2e77eece4b4e065bb26a11f12e031b2d0a94257
+  data.tar.gz: ca2e295171c638b40f376bf8fd56a7027c79d08a063b534a666b9761e5f4102b436bfc34cc99b3cf8bab7a12a586fe7c702f62661a885f1291974efb73b14490

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+## 2.6.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.0..2.6.1)
+
+### Bug Fixes
+
+* Fix some ruby 2.7 warnings about keyword args. [#6000] by [@vcsjones]
+* Missing `create_another` translation in Vietnamese. [#6002] by [@imcvampire]
+* Using "destroy" for user facing message is too robotic, prefer "delete". [#6047] by [@vfonic]
+* Typo in confirmation message for comment deletion. [#6047] by [@vfonic]
+
 ## 2.6.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.5.0..v2.6.0)
 
 ### Enhacements
@@ -531,6 +540,7 @@ Please check [0-6-stable] for previous changes.
 [#5877]: https://github.com/activeadmin/activeadmin/pull/5877
 [#5886]: https://github.com/activeadmin/activeadmin/pull/5886
 [#5870]: https://github.com/activeadmin/activeadmin/pull/5870
+[#5894]: https://github.com/activeadmin/activeadmin/pull/5894
 [#5895]: https://github.com/activeadmin/activeadmin/pull/5895
 [#5867]: https://github.com/activeadmin/activeadmin/pull/5867
 [#5887]: https://github.com/activeadmin/activeadmin/pull/5887
@@ -541,6 +551,9 @@ Please check [0-6-stable] for previous changes.
 [#5946]: https://github.com/activeadmin/activeadmin/pull/5946
 [#5956]: https://github.com/activeadmin/activeadmin/pull/5956
 [#5957]: https://github.com/activeadmin/activeadmin/pull/5957
+[#6000]: https://github.com/activeadmin/activeadmin/pull/6000
+[#6002]: https://github.com/activeadmin/activeadmin/pull/6002
+[#6047]: https://github.com/activeadmin/activeadmin/pull/6047
 
 [@5t111111]: https://github.com/5t111111
 [@aarek]: https://github.com/aarek
@@ -575,6 +588,7 @@ Please check [0-6-stable] for previous changes.
 [@gonzedge]: https://github.com/gonzedge
 [@guigs]: https://github.com/guigs
 [@HappyKadaver]: https://github.com/HappyKadaver
+[@imcvampire]: https://github.com/imcvampire
 [@innparusu95]: https://github.com/innparusu95
 [@ionut998]: https://github.com/ionut998
 [@irmela]: https://github.com/irmela
@@ -618,6 +632,8 @@ Please check [0-6-stable] for previous changes.
 [@timoschilling]: https://github.com/timoschilling
 [@TimPetricola]: https://github.com/TimPetricola
 [@varyonic]: https://github.com/varyonic
+[@vcsjones]: https://github.com/vcsjones
+[@vfonic]: https://github.com/vfonic
 [@violeta-p]: https://github.com/violeta-p
 [@WaKeMaTTa]: https://github.com/WaKeMaTTa
 [@wasifhossain]: https://github.com/wasifhossain

data/CONTRIBUTING.md

@@ -191,24 +191,12 @@ met.
 Maintainers need to do the following to push out a release:
 
 * Make sure all pull requests are in and that changelog is current
-* Update `version.rb` file and changelog with new version number
-* If it's not a patch level release, create a stable branch for that release,
-  otherwise switch to the stable branch corresponding to the patch release you
-  want to ship:
-
-  ```sh
-  git checkout master
-  git fetch activeadmin
-  git rebase activeadmin/master
-  # If the release is 2.1.x then this should be: 2-1-stable
-  git checkout -b N-N-stable
-  git push activeadmin N-N-stable:N-N-stable
-  ```
-
+* Switch to the master branch and make sure it's up to date.
 * Make sure you have [chandler] properly configured. Chandler is used to
   automatically submit github release notes from the changelog right after
   pushing the gem to rubygems.
-* `bin/rake release`
+* Run one of `bin/rake release:prepare_{prerelease,prepatch,patch,preminor,minor,premajor,major}`, push the result and create a PR.
+* Run `bin/rake release` from the target branch once the PR is merged.
 
 [chandler]: https://github.com/mattbrictson/chandler#2-configure-credentials
 [Stack Overflow]: http://stackoverflow.com/questions/tagged/activeadmin

data/config/locales/en-CA.yml

@@ -68,8 +68,8 @@
       default_confirmation: "Are you sure you want to do this?"
       delete_confirmation: "Are you sure you want to delete these %{plural_model}?"
       succesfully_destroyed:
-        one: "Successfully destroyed 1 %{model}"
-        other: "Successfully destroyed %{count} %{plural_model}"
+        one: "Successfully deleted 1 %{model}"
+        other: "Successfully deleted %{count} %{plural_model}"
       selection_toggle_explanation: "(Toggle Selection)"
       action_label: "%{title} Selected"
       labels:
@@ -82,7 +82,7 @@
       author: "Author"
       add: "Add Comment"
       delete: "Delete Comment"
-      delete_confirmation: "Are you sure you want to delete these comment?"
+      delete_confirmation: "Are you sure you want to delete these comments?"
       resource: "Resource"
       no_comments_yet: "No comments yet."
       author_missing: "Anonymous"

data/config/locales/en-GB.yml

@@ -68,8 +68,8 @@
       default_confirmation: "Are you sure you want to do this?"
       delete_confirmation: "Are you sure you want to delete these %{plural_model}?"
       succesfully_destroyed:
-        one: "Successfully destroyed 1 %{model}"
-        other: "Successfully destroyed %{count} %{plural_model}"
+        one: "Successfully deleted 1 %{model}"
+        other: "Successfully deleted %{count} %{plural_model}"
       selection_toggle_explanation: "(Toggle Selection)"
       action_label: "%{title} Selected"
       labels:
@@ -82,7 +82,7 @@
       author: "Author"
       add: "Add Comment"
       delete: "Delete Comment"
-      delete_confirmation: "Are you sure you want to delete these comment?"
+      delete_confirmation: "Are you sure you want to delete these comments?"
       resource: "Resource"
       no_comments_yet: "No comments yet."
       author_missing: "Anonymous"

data/config/locales/en.yml

@@ -91,8 +91,8 @@ en:
       default_confirmation: "Are you sure you want to do this?"
       delete_confirmation: "Are you sure you want to delete these %{plural_model}?"
       succesfully_destroyed:
-        one: "Successfully destroyed 1 %{model}"
-        other: "Successfully destroyed %{count} %{plural_model}"
+        one: "Successfully deleted 1 %{model}"
+        other: "Successfully deleted %{count} %{plural_model}"
       selection_toggle_explanation: "(Toggle Selection)"
       action_label: "%{title} Selected"
       labels:
@@ -105,7 +105,7 @@ en:
       author: "Author"
       add: "Add Comment"
       delete: "Delete Comment"
-      delete_confirmation: "Are you sure you want to delete these comment?"
+      delete_confirmation: "Are you sure you want to delete these comments?"
       resource: "Resource"
       no_comments_yet: "No comments yet."
       author_missing: "Anonymous"

data/config/locales/lv.yml

@@ -60,8 +60,8 @@ lv:
       default_confirmation: "Vai tiešām vēlaties to darīt?"
       delete_confirmation: "Vai tiešām vēlaties dzēst šos %{plural_model}?"
       succesfully_destroyed:
-        one: "Successfully destroyed 1 %{model}"
-        other: "Successfully destroyed %{count} %{plural_model}"
+        one: "Successfully deleted 1 %{model}"
+        other: "Successfully deleted %{count} %{plural_model}"
       selection_toggle_explanation: "(Toggle Selection)"
       action_label: "%{title} Selected"
       labels:

data/config/locales/vi.yml

@@ -11,6 +11,7 @@ vi:
     new_model: "Tạo mới %{model}"
     edit_model: "Chỉnh sửa %{model}"
     delete_model: "Xóa %{model}"
+    create_another: "Tạo thêm %{model}"
     details: "%{model} Chi tiết"
     cancel: "Hủy"
     empty: "Trống"

data/docs/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.1)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -26,12 +26,12 @@ GEM
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.17.1)
+    faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.11.3)
+    ffi (1.12.1)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    github-pages (203)
+    github-pages (204)
       github-pages-health-check (= 1.16.1)
       jekyll (= 3.8.5)
       jekyll-avatar (= 0.7.0)
@@ -40,7 +40,7 @@ GEM
       jekyll-default-layout (= 0.1.4)
       jekyll-feed (= 0.13.0)
       jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.12.1)
+      jekyll-github-metadata (= 2.13.0)
       jekyll-mentions (= 1.5.1)
       jekyll-optional-front-matter (= 0.3.2)
       jekyll-paginate (= 1.1.0)
@@ -80,7 +80,7 @@ GEM
       octokit (~> 4.0)
       public_suffix (~> 3.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.12.2)
+    html-pipeline (2.12.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
@@ -117,8 +117,8 @@ GEM
       jekyll (>= 3.7, < 5.0)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
-    jekyll-github-metadata (2.12.1)
-      jekyll (~> 3.4)
+    jekyll-github-metadata (2.13.0)
+      jekyll (>= 3.4, < 5.0)
       octokit (~> 4.0, != 4.4.0)
     jekyll-mentions (1.5.1)
       html-pipeline (~> 2.3)
@@ -193,7 +193,7 @@ GEM
       jekyll (>= 3.0, < 5.0)
     kramdown (1.17.0)
     liquid (4.0.3)
-    listen (3.2.0)
+    listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
@@ -202,17 +202,18 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.13.0)
+    minitest (5.14.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.6)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
-    octokit (4.14.0)
+    octokit (4.15.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (3.1.1)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
     rouge (3.13.0)
     ruby-enum (0.7.2)
@@ -232,9 +233,9 @@ GEM
     thread_safe (0.3.6)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
     zeitwerk (2.2.2)
 
 PLATFORMS

data/lib/active_admin/csv_builder.rb

@@ -51,14 +51,14 @@ module ActiveAdmin
       csv << bom if bom
 
       if column_names
-        csv << CSV.generate_line(columns.map { |c| encode c.name, options }, csv_options)
+        csv << CSV.generate_line(columns.map { |c| encode c.name, options }, **csv_options)
       end
 
       ActiveRecord::Base.uncached do
         (1..paginated_collection.total_pages).each do |page|
           paginated_collection(page).each do |resource|
             resource = controller.send :apply_decorator, resource
-            csv << CSV.generate_line(build_row(resource, columns, options), csv_options)
+            csv << CSV.generate_line(build_row(resource, columns, options), **csv_options)
           end
         end
       end
@@ -81,7 +81,11 @@ module ActiveAdmin
 
     def encode(content, options)
       if options[:encoding]
-        content.to_s.encode options[:encoding], options[:encoding_options]
+        if options[:encoding_options]
+          content.to_s.encode options[:encoding], **options[:encoding_options]
+        else
+          content.to_s.encode options[:encoding]
+        end
       else
         content
       end

data/lib/active_admin/localizers/resource_localizer.rb

@@ -21,7 +21,7 @@ module ActiveAdmin
         scope = options.delete(:scope)
         specific_key = array_to_key('resources', @model_name, scope, key)
         defaults = [array_to_key(scope, key), key.to_s.titleize]
-        ::I18n.t specific_key, options.reverse_merge(model: @model, default: defaults, scope: 'active_admin')
+        ::I18n.t specific_key, **options.reverse_merge(model: @model, default: defaults, scope: 'active_admin')
       end
       alias_method :t, :translate
 

data/lib/active_admin/resource/naming.rb

@@ -46,7 +46,7 @@ module ActiveAdmin
       end
 
       def translate(options = {})
-        I18n.t i18n_key, { scope: [:activerecord, :models] }.merge(options)
+        I18n.t i18n_key, **{ scope: [:activerecord, :models] }.merge(options)
       end
 
       def route_key

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '2.6.0'
+  VERSION = '2.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -599,7 +599,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style