diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-03-22 09:34:33 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-03-22 09:34:33 -0700 |
| commit | 2ef6270f8fbbefba8d4f10504497e198d8e7deea (patch) | |
| tree | a90b640a9e59306e92fc4bcc2ab58d08b0341e23 /actionpack/test/fixtures/custom_pattern/html/another.erb | |
| parent | 6ab65bec611247bbd1dd62da0ee8c4dc44b37ec1 (diff) | |
| parent | 2ddfdba9a0dab7d8499c3ad0d13583bddbac4f69 (diff) | |
| download | rails-2ef6270f8fbbefba8d4f10504497e198d8e7deea.tar.gz rails-2ef6270f8fbbefba8d4f10504497e198d8e7deea.tar.bz2 rails-2ef6270f8fbbefba8d4f10504497e198d8e7deea.zip | |
Merge branch 'master' into fuuu
* master:
Do not show optional (.:format) block for wildcard route [#6605 state:resolved]
pushing id insertion and prefetch primary keys down to Relation#insert
use prepared statements to fetch the last insert id
escaping binary data encoding when inserting to sqlite3. Thanks Naruse! [#6559 state:resolved]
schemas set by set_table_name are respected by the mysql adapter. [#5322 state:resolved]
Reapply extensions when using except and only
SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this test
Improved resolver docs a bit
[action_view] docs for FileSystemResolver
[action_view] added custom patterns to template resolver
Diffstat (limited to 'actionpack/test/fixtures/custom_pattern/html/another.erb')
| -rw-r--r-- | actionpack/test/fixtures/custom_pattern/html/another.erb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/custom_pattern/html/another.erb b/actionpack/test/fixtures/custom_pattern/html/another.erb new file mode 100644 index 0000000000..dbd7e96ab6 --- /dev/null +++ b/actionpack/test/fixtures/custom_pattern/html/another.erb @@ -0,0 +1 @@ +Another template!
\ No newline at end of file |