aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1848 from raviolicode/postgresql_order_multiple_paramsSantiago Pastorino2011-06-242-1/+8
|\ | | | | Fix for complex ordering of multiple columns on postgresql
| * Improve ordering of multiple columns on postgresqlLucia Escanellas2011-06-242-1/+8
| | | | | | | | | | * Only on postgresql, order("first asc, second asc") was invalid * Closes #1720
* | Merge pull request #1840 from wildchild/masterSantiago Pastorino2011-06-231-2/+2
|\ \ | | | | | | Minor formatting fix
| * | Minor formating fixAlexander Uvarov2011-06-241-2/+2
| | |
* | | Merge pull request #1829 from wildchild/masterJosé Valim2011-06-233-3/+32
|\| | | | | | | | Allow to specify roles for mass-assignment as array
| * | 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
| | |
* | | Apply the default scope earlier when doing calculations. Fixes #1682.Jon Leighton2011-06-233-5/+24
| |/ |/|
* | Merge pull request #1835 from metaskills/ss_rake_masterAaron Patterson2011-06-231-6/+7
|\ \ | | | | | | Update SQL Server DB Rake Tasks
| * | Update SQL Server db related rake tasks.Ken Collins2011-06-231-6/+7
|/ / | | | | | | | | | | * Uses open source smoscript since scptxfr came out in 2000. * Uses sqlcmd which replaces osql. * Takes advantage of host/user/pass passed down by TinyTDS.
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-2315-99/+143
|\ \
| * | updated rspec linkMikhail Dieterle2011-06-231-1/+1
| | |
| * | grammar changes in named routes description and clarity around possibilities ↵Matt Jankowski2011-06-221-10/+10
| | | | | | | | | | | | for options
| * | font style changes in perf guideVijay Dev2011-06-221-2/+2
| | |
| * | grammar changes to log subscriber docsMatt Jankowski2011-06-221-4/+4
| | |
| * | move example code to be above reconfiguring discussion; add clarity about ↵Matt Jankowski2011-06-221-11/+16
| | | | | | | | | | | | silencers and filters; misc grammar changes - for backtrace cleaners
| * | Fixed typoMikhail Dieterle2011-06-221-1/+1
| | |
| * | use present tense on examplesMatt Jankowski2011-06-211-5/+5
| | |
| * | more detail on how the flow between redirect and show works, and minor grammarMatt Jankowski2011-06-211-7/+9
| | |
| * | remove extra space and clarify how an exception is made for controller wide ↵Matt Jankowski2011-06-211-3/+3
| | | | | | | | | | | | layouts
| * | reorder layout selection examples to occur in the order that the code does, ↵Matt Jankowski2011-06-211-5/+6
| | | | | | | | | | | | and provide more detail on why each selection is made
| * | singularize module and be explicit about what is deliveredMatt Jankowski2011-06-211-1/+1
| | |
| * | grammar (missing "a") and formattingMatt Jankowski2011-06-211-3/+3
| | |
| * | clarify why the only_path => false option is needed when default :host has ↵Matt Jankowski2011-06-211-4/+4
| | | | | | | | | | | | been set for mailers
| * | elaborate details on why to use _url instead of _path in mailersMatt Jankowski2011-06-211-2/+3
| | |
| * | Added Gzip to Asset Pipeline via GitHubMohammad Typaldos2011-06-211-0/+2
| | |
| * | Sprockets itself doesn't compressMohammad Typaldos2011-06-201-4/+4
| | |
| * | Edited railties/guides/source/asset_pipeline.textile via GitHubMohammad Typaldos2011-06-201-1/+6
| | |
| * | Closing </yaml> Arun Agrawal2011-06-201-1/+1
| | |
| * | document Active Record's reverse_order methodVijay Dev2011-06-201-0/+27
| | |
| * | AR: use where in place of findVijay Dev2011-06-201-3/+1
| | |
| * | minor changes in getting started guideVijay Dev2011-06-201-5/+5
| | |
| * | document the instance_reader option for class_attributeVijay Dev2011-06-201-3/+15
| | |
| * | typo changesJudeArasu2011-06-191-2/+3
| | |
| * | Consistency issues with pre-processorMohammad Typaldos2011-06-181-1/+1
| | |
| * | Edited railties/guides/source/asset_pipeline.textile via GitHubMohammad Typaldos2011-06-181-1/+1
| | |
| * | Let the reader know what JS and CSS stand for. Slight rewording as well.Mohammad Typaldos2011-06-181-1/+1
| | |
| * | edit assets guide for cases & minor wording changesVijay Dev2011-06-181-3/+3
| | |
| * | Sprockets itself doesn't do this, it's uglifier and other gems, Sprockets is ↵Mohammad Typaldos2011-06-181-3/+1
| | | | | | | | | | | | just the puppet master.
| * | Edited railties/guides/source/asset_pipeline.textile via GitHubMohammad Typaldos2011-06-181-16/+8
| | |
| * | Merge pull request #48 from scott-stewart/masterXavier Noria2011-06-181-2/+2
| |\ \ | | | | | | | | Fixed typos in asset_pipeline
| | * | 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
|/ /