aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Display annotations from .coffee files in `rake notes`Bartlomiej Kozal2012-02-052-12/+14
* Merge pull request #4891 from kennyj/fix_4883Santiago Pastorino2012-02-052-3/+4
|\
| * Optional start_day argument for Time#all_week.kennyj2012-02-062-3/+4
|/
* Merge pull request #4888 from kennyj/fix_2982José Valim2012-02-052-1/+7
|\
| * Add testcase for non english filename. Related to #2982.kennyj2012-02-052-1/+7
* | Merge pull request #4886 from bogdan/callbacks_cleanupJosé Valim2012-02-051-17/+13
|\ \ | |/ |/|
| * AS::Callbacks: remove unused codeBogdan Gusiev2012-02-051-17/+13
|/
* Merge pull request #4875 from sikachu/master-asset-urlJosé Valim2012-02-056-2/+203
|\
| * Add *_url helpers to get the full assets URLPrem Sichanugrist2012-02-046-2/+203
|/
* Clean up a bit default_response handling and cache format negotiation.José Valim2012-02-042-19/+17
* Merge pull request #4869 from sikachu/master-responder-fixJosé Valim2012-02-044-8/+60
|\
| * Fix override API response bug in respond_withPrem Sichanugrist2012-02-034-8/+60
* | Merge pull request #4879 from kennyj/fix_4873José Valim2012-02-042-2/+9
|\ \
| * | Fix GH #4873. Allow swapping middleware of same classkennyj2012-02-042-2/+9
|/ /
* | remove unasserted line in testVijay Dev2012-02-041-1/+0
* | make the ONLY env variable used in guides generation work with kindle guidesVijay Dev2012-02-041-1/+1
* | Merge pull request #4877 from bogdan/drop_per_keyJosé Valim2012-02-044-49/+46
|\ \
| * | AS::Callbacks: rip out per_key option.Bogdan Gusiev2012-02-044-49/+46
* | | mention how to generate guides for the Kindle [ci skip]Vijay Dev2012-02-041-2/+14
* | | document config.active_record.dependent_restrict_raises in the configuring gu...Vijay Dev2012-02-041-0/+2
|/ /
* | Merge pull request #4866 from bogdan/terminate_after_callbacksJosé Valim2012-02-045-7/+12
|\ \ | |/ |/|
| * AS::Callbacks: :skip_after_callbacks_if_terminated optionBogdan Gusiev2012-02-035-7/+12
* | Merge pull request #4865 from bogdan/deprecate_per_keyJosé Valim2012-02-032-8/+6
|\ \
| * | AC::Callbacks: remove usage of :per_key option from filtersBogdan Gusiev2012-02-032-8/+6
| |/
* | Merge pull request #4863 from norman/unicodeVijay Dev2012-02-031-0/+2
|\ \
| * | Added note about new Unicode version.Norman Clarke2012-02-031-0/+2
* | | Merge pull request #4862 from norman/unicodeJosé Valim2012-02-033-1/+1
|\| |
| * | Update Unicode database to recently-released 6.1.Norman Clarke2012-02-033-1/+1
* | | Merge pull request #4861 from arunagw/verbose_test_outputJosé Valim2012-02-036-0/+6
|\ \ \ | |/ / |/| |
| * | Verbose output for tests.Arun Agrawal2012-02-036-0/+6
|/ /
* | Merge pull request #4860 from carlosantoniodasilva/generators-hide-namespaceJosé Valim2012-02-034-1/+25
|\ \ | |/ |/|
| * Add convenience method to hide a generator from the available onesCarlos Antonio da Silva2012-02-034-1/+25
|/
* Merge pull request #4856 from ihid/store_null_bugAaron Patterson2012-02-024-3/+16
|\
| * Allow store to be a not null column.Jeremy Walker2012-02-024-3/+16
* | *args is already an array. :'(Aaron Patterson2012-02-021-1/+1
* | Merge pull request #4853 from rafaelfranca/fix-build-againAaron Patterson2012-02-022-6/+5
|\ \
| * | columns method doesn't have name argumentRafael Mendonça França2012-02-022-6/+5
|/ /
* | removed whitespace errors :yellow_heart::blue_heart::purple_heart::heart::gre...Aaron Patterson2012-02-021-4/+4
* | Merge pull request #4851 from carlosantoniodasilva/collection-helpersJosé Valim2012-02-0210-51/+793
|\ \
| * | Remove default class to collection_check_boxes andRafael Mendonça França2012-02-026-36/+36
| * | Allow collection radio_buttons/check_boxes to access current text/valueCarlos Antonio da Silva2012-02-023-0/+60
| * | Add changelog, docs and guides entriesCarlos Antonio da Silva2012-02-024-20/+193
| * | Allow proc for value/text method in collection_selectCarlos Antonio da Silva2012-02-023-16/+48
| * | Move collection radio buttons / check boxes back to FormOptionsHelperCarlos Antonio da Silva2012-02-024-92/+81
| * | Extract common collection helpers to a module to avoid too much inheritanceCarlos Antonio da Silva2012-02-023-69/+93
| * | Create a Builder factory class to use with collection helpers + blockCarlos Antonio da Silva2012-02-023-21/+45
| * | Refactor collection helpers to extract radio/checkbox/label callsCarlos Antonio da Silva2012-02-022-8/+18
| * | Remove collection_wrapper* and item_wrapper* optionsCarlos Antonio da Silva2012-02-024-218/+15
| * | Refactor value sanitization logicCarlos Antonio da Silva2012-02-022-8/+16
| * | Cleanup options helper methods a bitCarlos Antonio da Silva2012-02-021-12/+12