rails_admin 2.0.0.rc → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b0f4ab7caf68837692964e8e69e90d167282dafa55a35aaaa3d76eb93f97b9d
-  data.tar.gz: 9a6407f79b492dffafd49568675b7982122c76e080519c0f6b3156abbeb3e71a
+  metadata.gz: abb27440720764e68f2c73906b3792c209dbae39f6a54690894e0d1c42983c5f
+  data.tar.gz: 2cc7c7588ab9419f9a486f185ea6f345e62c2b2b2e4588e39810f05c5b5a4fdf
 SHA512:
-  metadata.gz: 127e444d5dee93ccb6cd28c210368bc143d06732f5683917b0b969eac3717a3a606d5415891d5e768385cc3fd445ce2d754c39f97daec21b50ee49595a5ecde2
-  data.tar.gz: 14ff533ab2205b78c5d3529bd0b16166af4b2ad54547c6c67d20ffde399ed17defe559dc53c7e34a3c3457ef16bf4de8b4122211c6ea663090946ca84e687380
+  metadata.gz: 4518ba5616e66359a663cb1e3978764fa230301eafedcf8fd51bf2257fd31f45ecbca50fd7d5bbcba7196b7b1b03e0822c31afd0183d01bcb842c3d2dd8a9f63
+  data.tar.gz: 5e65e91218271a2eb8b7bc5c44cd13769eb7427653382033b3f784442f3ceaf2c5fb739e924bd69b103b3af84f4f390f33de2ef2ec13c8b268c4af49187914fb

data/README.md

@@ -16,14 +16,6 @@
 
 RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.
 
-## Announcements
-
-### [Action required] Security issue
-
-> **RailsAdmin prior to 1.3.0 have been reported to have XSS vulnerability.** We strongly recommend that you upgrade RailsAdmin to 1.3.0 or later as soon as possible, if you are on those versions. See [#2985](https://github.com/sferik/rails_admin/issues/2985) for the detail.
-> 
-> Also, 1.0.0 and 1.1.0 is known to have [CSRF vulnerability](https://github.com/sferik/rails_admin/commit/b13e879eb93b661204e9fb5e55f7afa4f397537a), too.
-
 ## Getting started
 
 * Check out [the docs][docs].
@@ -50,7 +42,7 @@ RailsAdmin is a Rails engine that provides an easy-to-use interface for managing
 
 ## Installation
 
-1. On your gemfile: `gem 'rails_admin', '~> 2.0.0.rc'`
+1. On your gemfile: `gem 'rails_admin', '~> 2.0'`
 2. Run `bundle install`
 3. Run `rails g rails_admin:install`
 4. Provide a namespace for the routes when asked

data/config/locales/rails_admin.en.yml

@@ -45,6 +45,7 @@ en:
       navigation_static_label: "Links"
       log_out: "Log out"
       time_ago: "%{time} ago"
+      ago: "ago"
       more: "Plus %{count} more %{models_name}"
     flash:
       successful: "%{name} successfully %{action}"

data/lib/rails_admin/adapters/mongoid/association.rb

@@ -41,7 +41,7 @@ module RailsAdmin
         end
 
         def primary_key
-          :_id
+          association.primary_key.to_sym rescue :_id
         end
 
         def foreign_key

data/lib/rails_admin/config/actions/index.rb

@@ -49,7 +49,7 @@ module RailsAdmin
               format.json do
                 output = begin
                   if params[:compact]
-                    primary_key_method = @model_config.abstract_model.primary_key
+                    primary_key_method = @association ? @association.associated_primary_key : @model_config.abstract_model.primary_key
                     label_method = @model_config.object_label_method
                     @objects.collect { |o| {id: o.send(primary_key_method).to_s, label: o.send(label_method).to_s} }
                   else

data/lib/rails_admin/config/fields/types/belongs_to_association.rb

@@ -35,6 +35,10 @@ module RailsAdmin
             true
           end
 
+          def associated_primary_key
+            @associated_primary_key ||= association.primary_key
+          end
+
           def selected_id
             bindings[:object].send(foreign_key)
           end

data/lib/rails_admin/version.rb

@@ -3,7 +3,7 @@ module RailsAdmin
     MAJOR = 2
     MINOR = 0
     PATCH = 0
-    PRE = 'rc'.freeze
+    PRE = nil
 
     class << self
       # @return [String]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc
+  version: 2.0.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-04 00:00:00.000000000 Z
+date: 2019-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -609,9 +609,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: 1.8.11
 requirements: []
 rubygems_version: 3.0.3
 signing_key: