aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update reverse order with new Arel NodesOriol Gual2011-06-281-1/+2
|
* Add more test casesOriol Gual2011-06-281-0/+8
|
* Add failing testOriol Gual2011-06-281-0/+4
|
* Merge pull request #1857 from vijaydev/irreversible-migrationAaron Patterson2011-06-282-7/+9
|\ | | | | IrreversibleMigration is not raised when a method not supported by reversible migrations is called in the change method of a migration
| * record unsupported methods in CommandRecorder instead of letting the ↵Vijay Dev2011-06-252-7/+9
| | | | | | | | unsupported methods go through to the underlying db causing errors like duplicate columns to occur when rolling back migrations
* | Merge pull request #1860 from dmathieu/comparisonAaron Patterson2011-06-282-0/+22
|\ \ | | | | | | Allow comparison on model objects - Closes #1858
| * | comparing different classes returns nilDamien Mathieu2011-06-262-1/+11
| | |
| * | allow comparison on model objects - Closes #1858Damien Mathieu2011-06-262-0/+12
| | |
* | | remove useless assignmentAaron Patterson2011-06-281-2/+1
| | |
* | | lock_optimistically is typically true, so evaluate the common failure case firstAaron Patterson2011-06-281-1/+1
| | |
* | | reduce object allocation during AR instantiationAaron Patterson2011-06-282-3/+8
| | |
* | | Merge pull request #1878 from arunagw/mime_test_fixJosé Valim2011-06-281-3/+3
|\ \ \ | | | | | | | | Removing image/gif from this test.
| * | | No need to register again. As it's default now.Arun Agrawal2011-06-281-3/+3
| | | | | | | | | | | | Removing gif from here because when it got unregister it start failing other places.
* | | | Update railties.gemspecJosé Valim2011-06-281-0/+3
|/ / /
* | | 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::Zip
| * | | 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
|\ \ \ | | | | | | | | Fixed issue #1847
| * | | Make send_file guess content-type from file extension, if type wasn't ↵Esad Hajdarevic2011-06-282-2/+32
| | | | | | | | | | | | | | | | supplied (Issue #1847). Update tests & documentation.
| * | | 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 ↵Aaron Patterson2011-06-272-3/+4
| | | | | | | | | | | | pick up the type column
* | | 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 ↵Aaron Patterson2011-06-275-5/+14
| | | | | | | | | | | | test surrounding create_with(nil) behavior
* | | Merge pull request #1871 from guilleiguaran/arel-2-1-3Aaron Patterson2011-06-272-2/+2
|\ \ \ | | | | | | | | Bump ARel to 2.1.3
| * | | 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
|\ \ \ | | | | | | | | Asset urls master
| * | | Added a configuration setting:Chris Eppstein2011-06-276-17/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.action_controller.default_asset_host_protocol It's best to leave this unset. When unset the :request protocol is used whenever it can be and :relative is used in the other situations. When set to :request then assets hosts will be disabled when there is no request in scope and will use the request protocol whenever a request is in scope. If set to :relative, then a relative protocol is always used except for stylesheet link tags which must use the :request protocol to avoid double downloads in IE6&7. Conflicts: actionpack/lib/sprockets/helpers/rails_helper.rb actionpack/test/template/sprockets_helper_test.rb
| * | | Move the config bootstrapping to initialization to minimize access to the ↵Chris Eppstein2011-06-272-11/+14
| | | | | | | | | | | | | | | | Rails.application global.
| * | | Stylesheet link tags should use the request protocol to avoid duplicate ↵Chris Eppstein2011-06-275-27/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | download of stylesheets in IE7 and IE8. Conflicts: actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb actionpack/lib/sprockets/helpers/rails_helper.rb
| * | | Add asset_url helper and refactor the asset paths so that asset hosts can be ↵Chris Eppstein2011-06-275-47/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used during asset precompilation. Conflicts: actionpack/lib/action_view/asset_paths.rb actionpack/lib/sprockets/helpers/rails_helper.rb actionpack/test/template/sprockets_helper_test.rb
| * | | 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
|\ \ \ | | | | | | | | Generating /lib/assets for assets
| * | | 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.
| * | | Get the fixture_path from self.class instead of ActiveSupport::TestCase.David Chelimsky2011-06-252-1/+8
|/ / / | | | | | | | | | | | | | | | This allows test classes that are not subclasses of ActiveSupport::TestCase (like those in rspec-rails) to interact with with this variable without having to reference ActiveSupport::TestCase.
* | | Merge pull request #1853 from arunagw/string_parameterizeXavier Noria2011-06-251-1/+1
|\ \ \ | |_|/ |/| | StringToParameterizeWithNoSeparator: dashed parameter will not change.
| * | StringToParameterizeWithNoSeparator: dashed parameter will notArun Agrawal2011-06-251-1/+1
|/ / | | | | change.
* | 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
|\ \ | | | | | | Inflector support for acronyms (Issue #1366)
| * | Add acronym support to Inflector; Issue #1366David Lee2011-06-114-11/+105
| | |
| * | RefactorDavid Lee2011-06-114-94/+145
| | |