aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Deprecate passing the template handler in the template name.José Valim2011-09-2213-69/+72
| | | | | | For example, calling hello.erb is now deprecated. Since Rails 3.0 passing the handler had no effect whatsover. This commit simply deprecates such cases so we can clean up the code in later releases.
* Make handlers a registered detail.José Valim2011-09-221-6/+3
|
* Get rid of update_details in favor of passing details to find_template.José Valim2011-09-2210-86/+50
|
* it is now possible to pass details options (:formats, :details, :locales, ↵Nick Sutterer2011-09-225-10/+27
| | | | ...) to #render, #find_template and friends. this doesn't change anything in global context.
* Add rake test:template.Nick Sutterer2011-09-221-0/+5
|
* No need to recalculate the @details_key after update_details.José Valim2011-09-221-3/+2
|
* Merge pull request #3099 from wrozka/masterJosé Valim2011-09-222-3/+15
|\ | | | | Named routes are modifying passed options
| * Fix named routes modifying argumentsPawel Pierzchala2011-09-222-3/+15
|/
* Merge pull request #3027 from alex3/assets-precompile-regex-fixSantiago Pastorino2011-09-212-1/+10
|\ | | | | Default precompile regex was erroneously matching files
| * Default precompile regexp that properly matches application.js and ↵Alex Yakoubian2011-09-162-1/+10
| | | | | | | | application.css
* | Merge pull request #3081 from guilleiguaran/move-precompile-to-classSantiago Pastorino2011-09-213-22/+56
|\ \ | | | | | | Move precompiling from task to Sprockets::StaticCompiler
| * | Move precompile task to Sprockets::StaticCompilerGuillermo Iguaran2011-09-203-22/+56
| | |
* | | Add jquery-rails to Gemfile of plugins, test/dummy app uses it.Santiago Pastorino2011-09-211-1/+4
| | | | | | | | | | | | Closes #3091
* | | Slightly reorganize lookup context modules in order to better isolate cache ↵José Valim2011-09-211-100/+111
| | | | | | | | | | | | responsibilities.
* | | fix incorrect commentVijay Dev2011-09-221-1/+1
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-2113-28/+100
|\ \ \
| * | | Revert "add a missing "on" and remove the "endprologue" text"Vijay Dev2011-09-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3c5340ec9cbf12d19e734289ba748186af492d60. Reason: endprologue should not have been removed.
| * | | indentation fixesVijay Dev2011-09-211-2/+2
| | | |
| * | | add a missing "on" and remove the "endprologue" textWaynn Lue2011-09-211-3/+1
| | | |
| * | | add a '.' to etcWaynn Lue2011-09-211-1/+1
| | | |
| * | | add "the" to mirror the structure of the other two pointsWaynn Lue2011-09-211-1/+1
| | | |
| * | | copy edits 302e5707Vijay Dev2011-09-201-4/+3
| | | |
| * | | copy edits 908f2616Vijay Dev2011-09-201-4/+4
| | | |
| * | | remove unnecessary markupVijay Dev2011-09-201-6/+6
| | | |
| * | | Locale code for Czech is ":cs"Jan Vlnas2011-09-181-1/+1
| | | |
| * | | Document ActiveRecord::QueryMethods#selectRyan Bigg2011-09-171-0/+29
| | | |
| * | | sass-rails helpers - hyphenated in Sass, underscored in Ruby.Uģis Ozols2011-09-171-5/+5
| | | |
| * | | Fixing incorrect notextile tagsVijay Dev2011-09-169-24/+26
| | | |
| * | | minor editVijay Dev2011-09-161-1/+1
| | | |
| * | | Merge pull request #68 from kirs/masterKir Shatrov2011-09-161-0/+14
| |\ \ \ | | | | | | | | | | Paragraph about using variables in I18n translations was added to I18n Guide
| | * | | "Passing variables into the translation" section addedKir Shatrov2011-09-161-0/+14
| |/ / /
| * | | Add reference about --skip-sprockets to Asset Pipeline GuideGuillermo Iguaran2011-09-151-0/+6
| | | |
| * | | update guides, use html safe translations in i18nAlexey Vakhov2011-09-152-0/+22
| | | |
* | | | Merge pull request #3065 from brainopia/fix_to_param_testSantiago Pastorino2011-09-201-8/+8
|\ \ \ \ | |_|/ / |/| | | Fix test to reflect use of to_param for keys
| * | | Fix test to reflect use of to_param for keysbrainopia2011-09-181-8/+8
| | | |
* | | | Merge pull request #3064 from arunagw/jruby_test_fix_query_cache_testSantiago Pastorino2011-09-191-2/+4
|\ \ \ \ | |/ / / |/| | | fix test error when running with postgresql.
| * | | fix test error when running with postgresql.Arun Agrawal2011-09-181-2/+4
|/ / / | | | | | | | | | | | | This Sqlite3 should be in if block. Was giving error because sqlite3 is not loaded
* | | to_xml should also rely on serializable hash.José Valim2011-09-183-32/+33
| | |
* | | Merge pull request #3049 from brainopia/fix_to_query_edge_caseSantiago Pastorino2011-09-172-1/+10
|\ \ \ | | | | | | | | Fix Hash#to_query edge case with html_safe string on 1.8 ruby
| * | | Fix Hash#to_query edge case with html_safe string on 1.8 rubybrainopia2011-09-162-1/+10
| | | |
* | | | Merge pull request #3057 from arunagw/arjdbc_bump_masterSantiago Pastorino2011-09-171-3/+3
|\ \ \ \ | | | | | | | | | | Bump AR-JDBC version.
| * | | | Bump AR-JDBC version.Arun Agrawal2011-09-171-3/+3
| | |_|/ | |/| | | | | | THis version is compatible with 3.1 and above
* | | | Merge pull request #3058 from arunagw/jruby_query_cache_testSantiago Pastorino2011-09-171-1/+2
|\ \ \ \ | |/ / / |/| | | Fixed test for JRuby.
| * | | Fixed test for JRuby. Arun Agrawal2011-09-181-1/+2
|/ / / | | | | | | for Sqlite3 in AR-JDBC.It's Jdbc::SQLite3::VERSION
* / / Proper lines numbers for stack trace infoSantiago Pastorino2011-09-161-1/+1
|/ /
* | Merge pull request #3048 from masterkain/patch-2Vijay Dev2011-09-161-1/+1
|\ \ | | | | | | Fix typo in deprecation notice
| * | Fix typo in deprecation noticeClaudio Poli2011-09-161-1/+1
|/ /
* | Merge pull request #3042 from splattael/patch-1Vijay Dev2011-09-161-1/+1
|\ \ | | | | | | Fix typo in deprecation warning.
| * | Fix typo in deprecation warning.Peter Suschlik2011-09-161-1/+1
|/ /
* | Merge pull request #3040 from ↵José Valim2011-09-152-17/+0
|\ \ | | | | | | | | | | | | guilleiguaran/asset-host-should-not-be-nil-precompile config.action_controller.asset_host shouldn't set to nil during precompile