aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Fixed typo in asset_pipeline, jquery_rails should be jquery-railsScott Stewart2011-06-181-1/+1
| | | | |
| | * | | Edited railties/guides/source/asset_pipeline.textile via GitHubScott Stewart2011-06-181-1/+1
| |/ / /
| * | | Merge github.com:lifo/docrailsLeonard Garvey2011-06-181-8/+8
| |\ \ \
| | * | | Fix indentation on manifest examples in assets guideRyan Bigg2011-06-181-7/+7
| | | | |
| | * | | File needs to be at public/assets, not public/imagesRyan Bigg2011-06-181-1/+1
| | | | |
| * | | | Fixed a typo in asset pipelineLeonard Garvey2011-06-181-2/+2
| |/ / /
* | | | Edited actionpack/actionpack.gemspec via GitHubJosé Valim2011-06-231-1/+1
| | | |
* | | | Merge pull request #1830 from arunagw/enum_fixesJosé Valim2011-06-231-1/+1
|\ \ \ \ | |_|/ / |/| | | Fixed Failing test : It should be Enumerable::Enumerator
| * | | Using slice for instead of gsub to pass with 1.8.7Arun Agrawal2011-06-231-1/+1
|/ / /
* | | 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
|\ \ \ | | | | | | | | link_to doesn't allow rel attribute when also specifying method
| * | | 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
|\ \ \ \ | | | | | | | | | | Fixes an issue where cache sweepers with only after filters would have no controller object
| * | | | 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 ↵Jeroen Jacobs2011-06-211-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | controller object It would raise undefined method controller_name for nil
* | | | Revert "Bump sprockets requirement"Joshua Peek2011-06-221-1/+1
| | | | | | | | | | | | | | | | This reverts commit 458512c8fa31196816dd2372fddecd0e0237c4c0.
* | | | 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_order
| * | | | 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 fail
| * | | | | 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 for jdbc option added for Jruby
| * | | | | | Tests added when no option is given with #jruby. It should generateArun Agrawal2011-06-221-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sqlite3 based app
| * | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix nested fields_for when Hash-based model is passed.
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an error when a record object that is a subclass of Hash is passed to fields_for, which is incorrectly interpreted as field options.
* | | | | | | Merge pull request #1811 from ↵Aaron Patterson2011-06-215-23/+88
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nicksieger/more-jruby-gem-for-database-fixes-master More jruby gem for database fixes master
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improving PostgreSQL adapter schema-awareness
| * \ \ \ \ \ \ Merge remote branch 'rails/master' into pg_schema_fuPaul Gallagher2011-06-1995-542/+1294
| |\ \ \ \ \ \ \
| * | | | | | | | Make PostgreSQL adapter view-compatiblePaul Gallagher2011-06-193-4/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | * amongst other things, allows meta_search to run against view-backed models
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | * add/cleanup tests
| * | | | | | | | apply private method indentation conventionPaul Gallagher2011-06-103-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | * tidy test code and fix my typo
| * | | | | | | | Improve PostgreSQL adapter schema-awarenessPaul Gallagher2011-06-103-27/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * table_exists? scoped by schema search path unless schema is explicitly named. Added tests and doc to clarify the behaviour * extract_schema_and_table tests and implementation extended to cover all cases * primary_key does not ignore schema information * add current_schema and schema_exists? methods * more robust table referencing in insert_sql and sql_for_insert methods
* | | | | | | | | Merge pull request #1793 from jamesarosen/clean_imagesJosé Valim2011-06-212-2/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | rake assets:clean also removes directories
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/rails/rails/pull/1776#issuecomment-1402894, 2df2bfdb4b1165dce4b5bc3fe046147d793fead4, and 7440a254c4e724a5bbf6a0f4c8edb6d8d0432433.
* | | | | | | | | | 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 repo
| * | | | | | | | | Use uglifier from rubygems instead of git repoGuillermo Iguaran2011-06-211-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Don't use deprecated stuff.José Valim2011-06-211-2/+1
| | | | | | | | |