aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Edited activesupport/lib/active_support/core_ext/time/calculations.rb via GitHubJeremy Evans2011-09-011-1/+1
| * | | Merge pull request #3191 from yahonda/activerecord_unittest_db2Aaron Patterson2011-10-032-0/+5
| |\ \ \
| | * | | Fix typo in RakefileYasuo Honda2011-10-031-1/+1
| | * | | To support ActiveRecord unit tests for IBM DB2Yasuo Honda2011-10-022-0/+5
| * | | | Fix #3198.José Valim2011-10-031-39/+35
| * | | | add failing test for #3198Mark J. Titorenko2011-10-031-0/+13
| * | | | Merge pull request #3200 from docwhat/spelling-boobooSantiago Pastorino2011-10-031-1/+1
| |\ \ \ \
| | * | | | Rescuable spelling errorChristian Höltje2011-10-031-1/+1
| |/ / / /
| * | | | Ensure that enhancements to assets:precompile task are only run onceSam Pohlenz2011-10-032-0/+8
| * | | | Replace calls to capture(:stdout) with quietly in assets testsSam Pohlenz2011-10-031-4/+4
| * | | | Merge pull request #3193 from avakhov/patch-ac-test-case-safe-constantizeJosé Valim2011-10-031-3/+1
| |\ \ \ \
| | * | | | use safe_constantize instead constantize in AC::TestCaseAlexey Vakhov2011-10-031-3/+1
| | |/ / /
| * | | | Merge pull request #3194 from avakhov/patch-ac-test-case-testsJosé Valim2011-10-032-2/+30
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | normalize arg for AC::TestCase tests class methodAlexey Vakhov2011-10-032-2/+30
| |/ / /
| * | | :group => :assets should only run in the assets environment.José Valim2011-10-025-7/+8
| * | | rewords the docs of config.assets.initialize_on_precompile in the asset pipel...Xavier Noria2011-10-021-6/+8
| * | | documents config.assets.initialize_on_precompile in the asset pipeline guideXavier Noria2011-10-021-0/+7
| * | | Precompile properly refers files referenced with asset_path testSantiago Pastorino2011-10-021-1/+3
| * | | capture was commented outSantiago Pastorino2011-10-021-2/+2
| * | | Provide initialize_on_precompile which, when set to false, does not initializ...José Valim2011-10-024-16/+45
| * | | Merge pull request #3174 from phuibonhoa/masterJosé Valim2011-10-022-0/+9
| |\ \ \
| | * | | Improved testing so that it tests the real functionality and not the private ...Philippe Huibonhoa2011-10-021-4/+5
| | * | | Added fix so that file store does not raise an exception when cache dir does ...Philippe Huibonhoa2011-09-292-0/+8
| * | | | TestCase should respect the view_assigns API instead of pulling variables on ...José Valim2011-10-023-8/+23
| * | | | Update CHANGELOG.José Valim2011-10-021-0/+2
| * | | | Merge pull request #2583 from guilleiguaran/railsrcJosé Valim2011-10-022-0/+14
| |\ \ \ \
| | * | | | Print information about .railsrc to usersGuillermo Iguaran2011-10-022-0/+7
| | * | | | Read extra args for 'rails new' from ~/.railsrcGuillermo Iguaran2011-10-021-0/+7
| |/ / / /
* | | | | Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-10-01123-668/+1492
|\| | | |
| * | | | Merge pull request #3185 from arunagw/void_context_warnings_removedJosé Valim2011-10-011-1/+1
| |\ \ \ \
| | * | | | Use of :: in void context Warning removedArun Agrawal2011-10-011-1/+1
| |/ / / /
| * | | | Merge pull request #3181 from yahonda/fix_uninitialized_constant_testfixturesJosé Valim2011-09-301-1/+1
| |\ \ \ \
| | * | | | Modified how to handle if ActiveRecord is defined.Yasuo Honda2011-09-301-1/+1
| | |/ / /
| * | | | Provide read_attribute_for_serialization as the API to serialize attributes.José Valim2011-09-303-5/+30
| * | | | Set the default options value for as_json in the encoder object.José Valim2011-09-302-3/+3
| * | | | Merge pull request #3175 from nhocki/as-json-patchJosé Valim2011-09-302-1/+11
| |\ \ \ \
| | * | | | Fixing `as_json` method for ActiveRecord models.Nicolás Hock Isaza2011-09-292-1/+11
| | |/ / /
| * | | | Merge pull request #3177 from arunagw/void_warnings_removedJosé Valim2011-09-301-4/+4
| |\ \ \ \
| | * | | | possibly useless use of :: in void context Warning removedArun Agrawal2011-09-301-4/+4
| | |/ / /
| * | | | Merge pull request #3178 from arunagw/argument_warning_removedJosé Valim2011-09-301-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | warning removed : '&' interpreted as argument prefixArun Agrawal2011-09-301-1/+1
| |/ / /
| * | | Add CHANGELOG entriesSantiago Pastorino2011-09-293-1/+67
| * | | Don't call self.class unless necessary. Closes #3171.Jon Leighton2011-09-292-2/+3
| * | | Merge pull request #3167 from dmitriy-kiriyenko/honour_rails_env_environment_...José Valim2011-09-292-1/+17
| |\ \ \
| | * | | Honour RAILS_ENV environment variable when running rake.Dmitriy Kiriyenko2011-09-292-1/+17
| |/ / /
| * | | javascript_path and stylesheet_path should honor the asset pipeliningSantiago Pastorino2011-09-282-2/+28
| * | | Merge pull request #3159 from elliterate/digest_auth_with_query_stringJosé Valim2011-09-282-1/+10
| |\ \ \
| | * | | Fixed digest authentication for requests with a query string [#3158]Colin Shield & Ian Lesperance2011-09-282-1/+10
| * | | | Merge pull request #3156 from ihower/enhance_button_to_helper_v2Santiago Pastorino2011-09-282-5/+19
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Make button_to helper support "form" option which is the form attributes.Wen-Tien Chang2011-09-292-5/+19