Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make handlers a registered detail. | José Valim | 2011-09-22 | 1 | -6/+3 |
| | |||||
* | Get rid of update_details in favor of passing details to find_template. | José Valim | 2011-09-22 | 10 | -86/+50 |
| | |||||
* | it is now possible to pass details options (:formats, :details, :locales, ↵ | Nick Sutterer | 2011-09-22 | 5 | -10/+27 |
| | | | | ...) to #render, #find_template and friends. this doesn't change anything in global context. | ||||
* | Add rake test:template. | Nick Sutterer | 2011-09-22 | 1 | -0/+5 |
| | |||||
* | No need to recalculate the @details_key after update_details. | José Valim | 2011-09-22 | 1 | -3/+2 |
| | |||||
* | Merge pull request #3099 from wrozka/master | José Valim | 2011-09-22 | 2 | -3/+15 |
|\ | | | | | Named routes are modifying passed options | ||||
| * | Fix named routes modifying arguments | Pawel Pierzchala | 2011-09-22 | 2 | -3/+15 |
|/ | |||||
* | Merge pull request #3027 from alex3/assets-precompile-regex-fix | Santiago Pastorino | 2011-09-21 | 2 | -1/+10 |
|\ | | | | | Default precompile regex was erroneously matching files | ||||
| * | Default precompile regexp that properly matches application.js and ↵ | Alex Yakoubian | 2011-09-16 | 2 | -1/+10 |
| | | | | | | | | application.css | ||||
* | | Merge pull request #3081 from guilleiguaran/move-precompile-to-class | Santiago Pastorino | 2011-09-21 | 3 | -22/+56 |
|\ \ | | | | | | | Move precompiling from task to Sprockets::StaticCompiler | ||||
| * | | Move precompile task to Sprockets::StaticCompiler | Guillermo Iguaran | 2011-09-20 | 3 | -22/+56 |
| | | | |||||
* | | | Add jquery-rails to Gemfile of plugins, test/dummy app uses it. | Santiago Pastorino | 2011-09-21 | 1 | -1/+4 |
| | | | | | | | | | | | | Closes #3091 | ||||
* | | | Slightly reorganize lookup context modules in order to better isolate cache ↵ | José Valim | 2011-09-21 | 1 | -100/+111 |
| | | | | | | | | | | | | responsibilities. | ||||
* | | | fix incorrect comment | Vijay Dev | 2011-09-22 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-21 | 13 | -28/+100 |
|\ \ \ | |||||
| * | | | Revert "add a missing "on" and remove the "endprologue" text" | Vijay Dev | 2011-09-21 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3c5340ec9cbf12d19e734289ba748186af492d60. Reason: endprologue should not have been removed. | ||||
| * | | | indentation fixes | Vijay Dev | 2011-09-21 | 1 | -2/+2 |
| | | | | |||||
| * | | | add a missing "on" and remove the "endprologue" text | Waynn Lue | 2011-09-21 | 1 | -3/+1 |
| | | | | |||||
| * | | | add a '.' to etc | Waynn Lue | 2011-09-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | add "the" to mirror the structure of the other two points | Waynn Lue | 2011-09-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | copy edits 302e5707 | Vijay Dev | 2011-09-20 | 1 | -4/+3 |
| | | | | |||||
| * | | | copy edits 908f2616 | Vijay Dev | 2011-09-20 | 1 | -4/+4 |
| | | | | |||||
| * | | | remove unnecessary markup | Vijay Dev | 2011-09-20 | 1 | -6/+6 |
| | | | | |||||
| * | | | Locale code for Czech is ":cs" | Jan Vlnas | 2011-09-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Document ActiveRecord::QueryMethods#select | Ryan Bigg | 2011-09-17 | 1 | -0/+29 |
| | | | | |||||
| * | | | sass-rails helpers - hyphenated in Sass, underscored in Ruby. | Uģis Ozols | 2011-09-17 | 1 | -5/+5 |
| | | | | |||||
| * | | | Fixing incorrect notextile tags | Vijay Dev | 2011-09-16 | 9 | -24/+26 |
| | | | | |||||
| * | | | minor edit | Vijay Dev | 2011-09-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #68 from kirs/master | Kir Shatrov | 2011-09-16 | 1 | -0/+14 |
| |\ \ \ | | | | | | | | | | | Paragraph about using variables in I18n translations was added to I18n Guide | ||||
| | * | | | "Passing variables into the translation" section added | Kir Shatrov | 2011-09-16 | 1 | -0/+14 |
| |/ / / | |||||
| * | | | Add reference about --skip-sprockets to Asset Pipeline Guide | Guillermo Iguaran | 2011-09-15 | 1 | -0/+6 |
| | | | | |||||
| * | | | update guides, use html safe translations in i18n | Alexey Vakhov | 2011-09-15 | 2 | -0/+22 |
| | | | | |||||
* | | | | Merge pull request #3065 from brainopia/fix_to_param_test | Santiago Pastorino | 2011-09-20 | 1 | -8/+8 |
|\ \ \ \ | |_|/ / |/| | | | Fix test to reflect use of to_param for keys | ||||
| * | | | Fix test to reflect use of to_param for keys | brainopia | 2011-09-18 | 1 | -8/+8 |
| | | | | |||||
* | | | | Merge pull request #3064 from arunagw/jruby_test_fix_query_cache_test | Santiago Pastorino | 2011-09-19 | 1 | -2/+4 |
|\ \ \ \ | |/ / / |/| | | | fix test error when running with postgresql. | ||||
| * | | | fix test error when running with postgresql. | Arun Agrawal | 2011-09-18 | 1 | -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é Valim | 2011-09-18 | 3 | -32/+33 |
| | | | |||||
* | | | Merge pull request #3049 from brainopia/fix_to_query_edge_case | Santiago Pastorino | 2011-09-17 | 2 | -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 ruby | brainopia | 2011-09-16 | 2 | -1/+10 |
| | | | | |||||
* | | | | Merge pull request #3057 from arunagw/arjdbc_bump_master | Santiago Pastorino | 2011-09-17 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Bump AR-JDBC version. | ||||
| * | | | | Bump AR-JDBC version. | Arun Agrawal | 2011-09-17 | 1 | -3/+3 |
| | |_|/ | |/| | | | | | | THis version is compatible with 3.1 and above | ||||
* | | | | Merge pull request #3058 from arunagw/jruby_query_cache_test | Santiago Pastorino | 2011-09-17 | 1 | -1/+2 |
|\ \ \ \ | |/ / / |/| | | | Fixed test for JRuby. | ||||
| * | | | Fixed test for JRuby. | Arun Agrawal | 2011-09-18 | 1 | -1/+2 |
|/ / / | | | | | | | for Sqlite3 in AR-JDBC.It's Jdbc::SQLite3::VERSION | ||||
* / / | Proper lines numbers for stack trace info | Santiago Pastorino | 2011-09-16 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #3048 from masterkain/patch-2 | Vijay Dev | 2011-09-16 | 1 | -1/+1 |
|\ \ | | | | | | | Fix typo in deprecation notice | ||||
| * | | Fix typo in deprecation notice | Claudio Poli | 2011-09-16 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #3042 from splattael/patch-1 | Vijay Dev | 2011-09-16 | 1 | -1/+1 |
|\ \ | | | | | | | Fix typo in deprecation warning. | ||||
| * | | Fix typo in deprecation warning. | Peter Suschlik | 2011-09-16 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #3040 from ↵ | José Valim | 2011-09-15 | 2 | -17/+0 |
|\ \ | | | | | | | | | | | | | guilleiguaran/asset-host-should-not-be-nil-precompile config.action_controller.asset_host shouldn't set to nil during precompile | ||||
| * | | config.action_controller.asset_host shouldn't set to nil during precompile | Guillermo Iguaran | 2011-09-15 | 2 | -17/+0 |
|/ / |