diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-06-02 21:50:02 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-06-02 21:50:02 +0530 |
| commit | 40d5303b4f1f32b1f97259052bd200a7e0792c7e (patch) | |
| tree | 6879c06ca0b513636a8d882159a2da07ea701529 /guides/code | |
| parent | a769fe9db16a792164363b49e4c7f07f6e412eaa (diff) | |
| parent | ab2bf8148c8000a5185b11b6c1b11d94ae33053d (diff) | |
| download | rails-40d5303b4f1f32b1f97259052bd200a7e0792c7e.tar.gz rails-40d5303b4f1f32b1f97259052bd200a7e0792c7e.tar.bz2 rails-40d5303b4f1f32b1f97259052bd200a7e0792c7e.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'guides/code')
| -rw-r--r-- | guides/code/getting_started/app/controllers/welcome_controller.rb (renamed from guides/code/getting_started/app/controllers/home_controller.rb) | 1 | ||||
| -rw-r--r-- | guides/code/getting_started/test/functional/welcome_controller_test.rb (renamed from guides/code/getting_started/test/functional/home_controller_test.rb) | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/guides/code/getting_started/app/controllers/home_controller.rb b/guides/code/getting_started/app/controllers/welcome_controller.rb index 309b70441e..f9b859b9c9 100644 --- a/guides/code/getting_started/app/controllers/home_controller.rb +++ b/guides/code/getting_started/app/controllers/welcome_controller.rb @@ -1,5 +1,4 @@ class WelcomeController < ApplicationController def index end - end diff --git a/guides/code/getting_started/test/functional/home_controller_test.rb b/guides/code/getting_started/test/functional/welcome_controller_test.rb index dff8e9d2c5..e4d5abae11 100644 --- a/guides/code/getting_started/test/functional/home_controller_test.rb +++ b/guides/code/getting_started/test/functional/welcome_controller_test.rb @@ -5,5 +5,4 @@ class WelcomeControllerTest < ActionController::TestCase get :index assert_response :success end - end |