aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-11-07 19:23:54 +0900
committerGitHub <noreply@github.com>2018-11-07 19:23:54 +0900
commit8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38 (patch)
tree8e8c482a1dc68df48f56a26ce0e5991cbbd0d23d /railties/lib
parent133e0ba33db5887b047c9ac8233e5b414657bca5 (diff)
parentb6e4305c3bca4c673996d0af9db0f4cfbf50215e (diff)
downloadrails-8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38.tar.gz
rails-8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38.tar.bz2
rails-8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38.zip
Merge pull request #34387 from yhirano55/rails_info_properties_json
Respond /rails/info/properties.json
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/info.rb4
-rw-r--r--railties/lib/rails/info_controller.rb12
2 files changed, 14 insertions, 2 deletions
diff --git a/railties/lib/rails/info.rb b/railties/lib/rails/info.rb
index 3df36efc4c..b8173c8d11 100644
--- a/railties/lib/rails/info.rb
+++ b/railties/lib/rails/info.rb
@@ -54,6 +54,10 @@ module Rails
table << "</table>"
end
end
+
+ def to_json
+ Hash[properties].to_json
+ end
end
# The Rails version.
diff --git a/railties/lib/rails/info_controller.rb b/railties/lib/rails/info_controller.rb
index b4f4a5922a..50fe176946 100644
--- a/railties/lib/rails/info_controller.rb
+++ b/railties/lib/rails/info_controller.rb
@@ -14,8 +14,16 @@ class Rails::InfoController < Rails::ApplicationController # :nodoc:
end
def properties
- @info = Rails::Info.to_html
- @page_title = "Properties"
+ respond_to do |format|
+ format.html do
+ @info = Rails::Info.to_html
+ @page_title = "Properties"
+ end
+
+ format.json do
+ render json: Rails::Info.to_json
+ end
+ end
end
def routes