diff options
| author | Matilda Smeds <matildasmeds@users.noreply.github.com> | 2018-12-09 18:28:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-09 18:28:00 +0100 |
| commit | 317ad3a583fd3dbe06de8724c7fc1c6ded4cae8b (patch) | |
| tree | c7084e546cbc2f289ac8cf2057c1010b4dc7f880 /railties/lib/rails/info_controller.rb | |
| parent | a87c91cd3993d776dc987ac43b5f6c897baa3206 (diff) | |
| parent | bad1041b82df941d588ae2565f62424d88104933 (diff) | |
| download | rails-317ad3a583fd3dbe06de8724c7fc1c6ded4cae8b.tar.gz rails-317ad3a583fd3dbe06de8724c7fc1c6ded4cae8b.tar.bz2 rails-317ad3a583fd3dbe06de8724c7fc1c6ded4cae8b.zip | |
Merge branch 'master' into guides_session_guidelines_2
Diffstat (limited to 'railties/lib/rails/info_controller.rb')
| -rw-r--r-- | railties/lib/rails/info_controller.rb | 12 |
1 files changed, 10 insertions, 2 deletions
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 |