aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Copy the bin to railties so it also works if you don't have the rails gem.José Valim2011-06-281-0/+2
* Merge pull request #1877 from arunagw/fix_mimeJosé Valim2011-06-282-4/+4
|\
| * Fix test to use Mime::ZipArun Agrawal2011-06-282-4/+4
|/
* Edited actionpack/CHANGELOG via GitHubJosé Valim2011-06-281-0/+4
* Merge pull request #1875 from esad/masterJosé Valim2011-06-283-2/+44
|\
| * Make send_file guess content-type from file extension, if type wasn't supplie...Esad Hajdarevic2011-06-282-2/+32
| * Register some commonly used mime types (png, jpeg, pdf, zip etc.) per defaultEsad Hajdarevic2011-06-281-0/+12
|/
* remove the check for needs_type_condition? because ensure_proper_type will pi...Aaron Patterson2011-06-272-3/+4
* stop using && for the short circuit side effectAaron Patterson2011-06-271-1/+1
* let strings be converted to symbols inside the interpreterAaron Patterson2011-06-271-2/+2
* avoice paying hash cost if there are no serialized attributesAaron Patterson2011-06-271-3/+4
* cache column defaults for AR object instantiationAaron Patterson2011-06-273-3/+16
* AR object instantiation is ~30% faster in the simple caseAaron Patterson2011-06-272-1/+17
* initialize instance variablesAaron Patterson2011-06-271-0/+2
* oops! remove debugging codesAaron Patterson2011-06-271-1/+0
* default create_with_value to a hash so we can eliminate conditionals, add tes...Aaron Patterson2011-06-275-5/+14
* Merge pull request #1871 from guilleiguaran/arel-2-1-3Aaron Patterson2011-06-272-2/+2
|\
| * Bump ARel to 2.1.3Guillermo Iguaran2011-06-272-2/+2
* | Merge pull request #1870 from chriseppstein/asset_urls_masterSantiago Pastorino2011-06-278-72/+216
|\ \
| * | Added a configuration setting:Chris Eppstein2011-06-276-17/+55
| * | Move the config bootstrapping to initialization to minimize access to the Rai...Chris Eppstein2011-06-272-11/+14
| * | Stylesheet link tags should use the request protocol to avoid duplicate downl...Chris Eppstein2011-06-275-27/+50
| * | Add asset_url helper and refactor the asset paths so that asset hosts can be ...Chris Eppstein2011-06-275-47/+129
| * | OrderedOptions must implement respond_to? if it implements method_missing.Chris Eppstein2011-06-272-9/+7
* | | the generated ALT attribute for images no longer contains the digest, if anyXavier Noria2011-06-272-1/+13
|/ /
* | Add JavaScript Runtime name to the Rails Info properties (thanks Sam Ruby)David Heinemeier Hansson2011-06-271-0/+4
* | Merge pull request #1481 from arunagw/lib_assetsDavid Heinemeier Hansson2011-06-272-1/+3
|\ \
| * | Using lib/assets only. Javascripts/Stylesheets people can fill later.Arun Agrawal2011-06-162-1/+3
* | | Merge pull request #1861 from dchelimsky/fixture_pathSantiago Pastorino2011-06-252-1/+8
|\ \ \ | |_|/ |/| |
| * | Get the fixture_path from self.class instead of ActiveSupport::TestCase.David Chelimsky2011-06-252-1/+8
|/ /
* | Merge pull request #1853 from arunagw/string_parameterizeXavier Noria2011-06-251-1/+1
|\ \
| * | StringToParameterizeWithNoSeparator: dashed parameter will notArun Agrawal2011-06-251-1/+1
|/ /
* | registers support for acronyms in the CHANGELOG of Active SupportXavier Noria2011-06-241-0/+2
* | Merge pull request #1648 from dlee/acronymsXavier Noria2011-06-247-103/+251
|\ \
| * | Add acronym support to Inflector; Issue #1366David Lee2011-06-114-11/+105
| * | RefactorDavid Lee2011-06-114-94/+145
| * | Test retain delimiter in parameterization inflectorDavid Lee2011-06-112-2/+5
* | | make the logs a little simpler to view, put the render message inline with ot...James Cox2011-06-242-5/+6
* | | Merge pull request #1848 from raviolicode/postgresql_order_multiple_paramsSantiago Pastorino2011-06-242-1/+8
|\ \ \
| * | | Improve ordering of multiple columns on postgresqlLucia Escanellas2011-06-242-1/+8
* | | | Merge pull request #1840 from wildchild/masterSantiago Pastorino2011-06-231-2/+2
|\ \ \ \
| * | | | Minor formating fixAlexander Uvarov2011-06-241-2/+2
* | | | | Merge pull request #1829 from wildchild/masterJosé Valim2011-06-233-3/+32
|\| | | |
| * | | | 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 related rake tasks.Ken Collins2011-06-231-6/+7
|/ / / /
* | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-2315-99/+143
|\ \ \ \
| * | | | updated rspec linkMikhail Dieterle2011-06-231-1/+1