Merge pull request fishbrain#14 from verypossible/master

Fix a broken instance var from administrate
Teamtailor · Jul 23, 2018 · 322d736 · 322d736
2 parents cf76126 + c4a8bd1
commit 322d736
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/administrate-field-belongs_to_search.gemspec b/administrate-field-belongs_to_search.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files = `git ls-files -z -- {spec}/*`.split("\x0")
 
   gem.add_dependency 'administrate', '>= 0.3', '< 1.0'
-  gem.add_dependency 'rails', '>= 4.2', '< 5.2'
+  gem.add_dependency 'rails', '>= 4.2', '< 6.0'
   gem.add_dependency 'selectize-rails', '~> 0.6'
 
   gem.add_development_dependency 'coveralls', '~> 0'

diff --git a/app/views/administrate/application/index.json.jbuilder b/app/views/administrate/application/index.json.jbuilder
@@ -19,5 +19,5 @@
 
 json.resources resources do |resource|
   json.id resource.id
-  json.dashboard_display_name @_dashboard.display_resource(resource)
+  json.dashboard_display_name @dashboard.display_resource(resource)
 end