diff options
author | José Valim <jose.valim@gmail.com> | 2012-03-28 23:51:34 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2012-03-28 23:51:34 -0700 |
commit | e51322a34b740a4ad3b651345e2420912fe2a15f (patch) | |
tree | c9d93d3933893f04534b5810a806b1dcf7e9663e /actionpack/test/fixtures | |
parent | e83e76eca4e134c91c4c2c1092b41f4483592172 (diff) | |
parent | 18d275ada1b23bf07cc51a815385afac6bb2b8cb (diff) | |
download | rails-e51322a34b740a4ad3b651345e2420912fe2a15f.tar.gz rails-e51322a34b740a4ad3b651345e2420912fe2a15f.tar.bz2 rails-e51322a34b740a4ad3b651345e2420912fe2a15f.zip |
Merge pull request #5625 from nertzy/prefix_partial_path_with_controller_namespace
Add config option to turn off prefixing partial path with controller namespace
Diffstat (limited to 'actionpack/test/fixtures')
-rw-r--r-- | actionpack/test/fixtures/fun/games/_game.erb | 2 | ||||
-rw-r--r-- | actionpack/test/fixtures/fun/serious/games/_game.erb | 2 | ||||
-rw-r--r-- | actionpack/test/fixtures/games/_game.erb | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/test/fixtures/fun/games/_game.erb b/actionpack/test/fixtures/fun/games/_game.erb index d51b7b3ebc..f0f542ff92 100644 --- a/actionpack/test/fixtures/fun/games/_game.erb +++ b/actionpack/test/fixtures/fun/games/_game.erb @@ -1 +1 @@ -<%= game.name %>
\ No newline at end of file +Fun <%= game.name %> diff --git a/actionpack/test/fixtures/fun/serious/games/_game.erb b/actionpack/test/fixtures/fun/serious/games/_game.erb index d51b7b3ebc..523bc55bd7 100644 --- a/actionpack/test/fixtures/fun/serious/games/_game.erb +++ b/actionpack/test/fixtures/fun/serious/games/_game.erb @@ -1 +1 @@ -<%= game.name %>
\ No newline at end of file +Serious <%= game.name %> diff --git a/actionpack/test/fixtures/games/_game.erb b/actionpack/test/fixtures/games/_game.erb new file mode 100644 index 0000000000..1aeb81fcba --- /dev/null +++ b/actionpack/test/fixtures/games/_game.erb @@ -0,0 +1 @@ +Just <%= game.name %> |