aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Minor formating fixAlexander Uvarov2011-06-241-2/+2
* Follow rails convention by using Array.wrapAlexander Uvarov2011-06-231-2/+3
* Allow to specify mass-assignment roles as arrayAlexander Uvarov2011-06-233-3/+31
* Minor refactorSantiago Pastorino2011-06-231-2/+2
* fixtures :all is already included in test_helper.rbSantiago Pastorino2011-06-231-2/+0
* Merge pull request #1796 from jdeseno/masterSantiago Pastorino2011-06-222-1/+10
|\
| * Adds a test to check link_to with method & rel optionsJosh2011-06-211-0/+7
| * Allow additional link relations when using method attribute with link_toJosh2011-06-201-1/+3
* | Merge pull request #1798 from jeroenj/cachesweeper-fixSantiago Pastorino2011-06-222-0/+6
|\ \
| * | Tests only after filters in cache sweepersJeroen Jacobs2011-06-221-0/+5
| * | Fixes an issue where cache sweepers with only after filters would have no con...Jeroen Jacobs2011-06-211-0/+1
| |/
* | Revert "Bump sprockets requirement"Joshua Peek2011-06-221-1/+1
* | Update CHANGELOG.José Valim2011-06-221-10/+5
* | Merge pull request #1790 from ernie/reverse_sql_order_fixAaron Patterson2011-06-222-3/+24
|\ \
| * | Support reversal of ARel orderings in reverse_sql_orderErnie Miller2011-06-202-3/+24
* | | Merge pull request #1750 from dmathieu/non_string_methodsXavier Noria2011-06-222-2/+6
|\ \ \
| * | | calling unsafe methods which don't return a string shouldn't failDamien Mathieu2011-06-222-2/+6
* | | | Merge pull request #1813 from arunagw/jruby_testsJosé Valim2011-06-221-3/+18
|\ \ \ \
| * | | | Tests added when no option is given with #jruby. It should generateArun Agrawal2011-06-221-0/+8
| * | | | Making tests according to the changes #jrubyArun Agrawal2011-06-221-3/+4
| * | | | Test added for jdbc-adapterArun Agrawal2011-06-221-0/+6
* | | | | Merge pull request #1778 from spohlenz/hash-modelsJosé Valim2011-06-223-1/+28
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use real hash model in nested fields_for with hash model testSam Pohlenz2011-06-222-4/+13
| * | | | Test for extractable_options? within nested fields_for.Sam Pohlenz2011-06-202-1/+19
* | | | | Merge pull request #1811 from nicksieger/more-jruby-gem-for-database-fixes-ma...Aaron Patterson2011-06-215-23/+88
|\ \ \ \ \
| * | | | | Use non-'jdbc*' names so that db:create and db:drop workNick Sieger2011-06-213-9/+9
| * | | | | Convert database names to ones appropriate for JRubyNick Sieger2011-06-211-1/+12
| * | | | | Add generic 'jdbc' database optionNick Sieger2011-06-212-4/+67
| * | | | | Remove superfluous pg driver install instructionsNick Sieger2011-06-211-9/+0
|/ / / / /
* | | | | Require helpers so autoload is properly setup.José Valim2011-06-211-1/+1
* | | | | Merge pull request #1632 from tardate/pg_schema_fuAaron Patterson2011-06-214-50/+285
|\ \ \ \ \
| * \ \ \ \ Merge remote branch 'rails/master' into pg_schema_fuPaul Gallagher2011-06-1995-542/+1294
| |\ \ \ \ \
| * | | | | | Make PostgreSQL adapter view-compatiblePaul Gallagher2011-06-193-4/+54
| * | | | | | make extract_schema_and_table a private methodPaul Gallagher2011-06-112-27/+24
| * | | | | | remove table quoting in primary_key methodPaul Gallagher2011-06-113-6/+48
| * | | | | | apply private method indentation conventionPaul Gallagher2011-06-103-25/+25
| * | | | | | Improve PostgreSQL adapter schema-awarenessPaul Gallagher2011-06-103-27/+173
* | | | | | | Merge pull request #1793 from jamesarosen/clean_imagesJosé Valim2011-06-212-2/+16
|\ \ \ \ \ \ \
| * | | | | | | Railties: added tests for rake assets:cleanJames A. Rosen2011-06-212-2/+16
| * | | | | | | rake assets:clean also removes directoriesJames A. Rosen2011-06-211-1/+1
* | | | | | | | Bump sprockets requirementJoshua Peek2011-06-211-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #1803 from guilleiguaran/uglifier-1-0José Valim2011-06-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use uglifier from rubygems instead of git repoGuillermo Iguaran2011-06-211-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Don't use deprecated stuff.José Valim2011-06-211-2/+1
* | | | | | | Assign Rails.cache to sprocketsJoshua Peek2011-06-211-0/+4
* | | | | | | Create an :assets group in the Gemfile.José Valim2011-06-217-23/+48
* | | | | | | Rename AV::Helpers::AssetPaths to AV::AssetPaths to solve autoload mess.José Valim2011-06-214-81/+84
* | | | | | | Add Rails.groups to encapsulate available groups for require.José Valim2011-06-212-0/+38
|/ / / / / /
* | | | | | Merge pull request #1786 from gazay/3-1-stable-regexp-fixJosé Valim2011-06-203-12/+0
|\ \ \ \ \ \
| * | | | | | Removed tests for rescue branch for Rails 2.x compatibilityAlexey Gaziev2011-06-202-9/+0