Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix failing tests and add tests for :formats on partial. | José Valim | 2011-09-23 | 1 | -5/+10 |
| | |||||
* | Using #extract_details in PartialRenderer, too! | Nick Sutterer | 2011-09-23 | 2 | -3/+1 |
| | |||||
* | Allow both sym and array for details options in #render. using ↵ | Nick Sutterer | 2011-09-23 | 3 | -2/+16 |
| | | | | LC#registered_details to extract options. | ||||
* | added tests for render :file/:template and the :formats/:handlers/:locale ↵ | Nick Sutterer | 2011-09-23 | 3 | -1/+19 |
| | | | | options. | ||||
* | Refactor AMo as_json. | José Valim | 2011-09-23 | 1 | -9/+5 |
| | |||||
* | Merge pull request #3106 from mattetti/master | José Valim | 2011-09-22 | 2 | -12/+20 |
|\ | | | | | ActiveModel JSON serialization bug fix | ||||
| * | fixed a bug with the json serialization when the class setting is set to not ↵ | Matt Aimonetti | 2011-09-22 | 2 | -12/+20 |
| | | | | | | | | include the root, but an instance is serialized with the root option passed as true | ||||
* | | set env to let rails know we're precompiling | Terence Lee | 2011-09-22 | 2 | -0/+12 |
| | | |||||
* | | AR wants sqlite3 1.3.4 | Terence Lee | 2011-09-22 | 1 | -1/+1 |
| | | |||||
* | | No need to create a range object | Santiago Pastorino | 2011-09-22 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #3096 from phuibonhoa/master | Santiago Pastorino | 2011-09-22 | 2 | -10/+18 |
|\ \ | | | | | | | FileStore key_file_path does not properly limit filenames to 255 characters | ||||
| * | | Updated existing test that fails with this fix ↵ | Philippe Huibonhoa | 2011-09-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | (8d63678d1406c5518d437709af0fde717c0248d7). Before the fix the test was giving a false positive, because file_store.key_file_path would return an empty filename (i.e. test/tmp_cache/4D0/F4D rather than test/tmp_cache/4D0/F4D/xxxx…). Even though the fix referenced above divides the filename into directories to prevent it from being too long, it seems that 1000 characters will always raise an error, so reducing the key size to 900). | ||||
| * | | Fixed issue in file store where it could create a filename that was too long ↵ | Philippe Huibonhoa | 2011-09-21 | 2 | -9/+17 |
| | | | | | | | | | | | | for the file system. (https://github.com/rails/rails/issues/3072) | ||||
* | | | Deprecate passing the template handler in the template name. | José Valim | 2011-09-22 | 13 | -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é 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 |