aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2019-01-08 22:21:20 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2019-01-08 22:21:20 +0100
commit80c7038bbc8e83762f4396b18260f470d8621995 (patch)
treeeea46890a81468ff1c9a593536b16734676c3279 /railties/lib/rails
parent647d7e61679ac4c28c081532ad0a0d7e1f80482b (diff)
downloadrails-80c7038bbc8e83762f4396b18260f470d8621995.tar.gz
rails-80c7038bbc8e83762f4396b18260f470d8621995.tar.bz2
rails-80c7038bbc8e83762f4396b18260f470d8621995.zip
Revert "Merge pull request #34387 from yhirano55/rails_info_properties_json"
We had a discussion on the Core team and we don't want to expose this information as a JSON endpoint and not by default. It doesn't make sense to expose this JSON locally and this controller is only accessible in dev, so the proposed access from a production app seems off. This reverts commit 8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38, reversing changes made to 133e0ba33db5887b047c9ac8233e5b414657bca5.
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/info.rb4
-rw-r--r--railties/lib/rails/info_controller.rb12
2 files changed, 2 insertions, 14 deletions
diff --git a/railties/lib/rails/info.rb b/railties/lib/rails/info.rb
index c68405619d..72b555ec19 100644
--- a/railties/lib/rails/info.rb
+++ b/railties/lib/rails/info.rb
@@ -54,10 +54,6 @@ 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 14459623ac..f74d979721 100644
--- a/railties/lib/rails/info_controller.rb
+++ b/railties/lib/rails/info_controller.rb
@@ -14,16 +14,8 @@ class Rails::InfoController < Rails::ApplicationController # :nodoc:
end
def 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
+ @info = Rails::Info.to_html
+ @page_title = "Properties"
end
def routes