aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump sprockets to 2.0.2Santiago Pastorino2011-10-041-11/+11
|
* Merge pull request #3212 from ayrton/masterSantiago Pastorino2011-10-041-1/+1
|\ | | | | incorrect to_formatted_s example
| * to_formatted_s is an instance method for a Range not an ArrayAyrton De Craene2011-10-041-1/+1
|/
* Clean up subdomain code a bit.José Valim2011-10-041-2/+2
|
* Merge pull request #3209 from ksob/subdomain_false_strips_subdomainsJosé Valim2011-10-044-5/+23
|\ | | | | :subdomain => false will remove all subdomains now. Closes #2025
| * :subdomain can now be specified with a value of false in url_for, allowing ↵Kamil Sobieraj2011-10-044-5/+23
| | | | | | | | for subdomain(s) removal from the host during link generation. Closes #2025
* | Fix failing tests and refactor assets.rakeJosé Valim2011-10-042-25/+38
| |
* | Changing rake db:schema:dump to run :environment as well as :load_config, as ↵Ben Woosley2011-10-041-1/+1
|/ | | | | | | | | | running :load_config alone will lead to the dumper being run without including extensions such as those included in foreigner and spatial_adapter. This reverses a change made here: https://github.com/rails/rails/commit/5df72a238e9fcb18daf6ab6e6dc9051c9106d7bb#L0L324 I'm assuming here that :load_config needs to be invoked separately from :environment, as it is elsewhere in the file for db operations, if not the alternative is to go back to "task :dump => :environment do". Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge pull request #3202 from abscondment/3053-missing-headersJosé Valim2011-10-032-1/+15
|\ | | | | Use rack-cache 1.1
| * Require rack-cache 1.1.Brendan Ribera2011-10-031-1/+1
| | | | | | | | | | | | | | Versions prior to 1.1 delete the If-Modified-Since and If-Not-Modified headers when config.action_controller.perform_caching is true. This has two problems: * unexpected inconsistent behaviour between development & production environments * breaks applications that use of these headers
| * Test demonstrating #3053: If-Modified-Since gets swallowed up by rack-cache.Brendan Ribera2011-10-031-0/+14
|/
* Merge pull request #2801 from jeremyevans/patch-1Jeremy Kemper2011-10-032-1/+4
|\ | | | | Fix obviously breakage of Time.=== for Time subclasses
| * Add tests for fixes to Time.===Jeremy Evans2011-09-071-0/+3
| |
| * 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
|\ \ | | | | | | To support ActiveRecord unit tests for IBM DB2
| * | 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
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Merge pull request #3200 from docwhat/spelling-boobooSantiago Pastorino2011-10-031-1/+1
|\ \ \ | | | | | | | | Rescuable spelling error
| * | | 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
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Replace calls to capture(:stdout) with quietly in assets testsSam Pohlenz2011-10-031-4/+4
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Merge pull request #3193 from avakhov/patch-ac-test-case-safe-constantizeJosé Valim2011-10-031-3/+1
|\ \ \ | | | | | | | | use safe_constantize instead constantize in AC::TestCase
| * | | 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 method
| * | 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 ↵Xavier Noria2011-10-021-6/+8
| | | | | | | | pipeline guide
* | 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 ↵José Valim2011-10-024-16/+45
| | | | | | | | initialize the app for precompilation. Defaults to true.
* | Merge pull request #3174 from phuibonhoa/masterJosé Valim2011-10-022-0/+9
|\ \ | | | | | | Fixed file store to handle delete_matched being called before cache dir is created.
| * | Improved testing so that it tests the real functionality and not the private ↵Philippe Huibonhoa2011-10-021-4/+5
| | | | | | | | | | | | method.
| * | Added fix so that file store does not raise an exception when cache dir does ↵Philippe Huibonhoa2011-09-292-0/+8
| | | | | | | | | | | | not exist yet. This can happen if a delete_matched is called before anything is saved in the cache.
* | | TestCase should respect the view_assigns API instead of pulling variables on ↵José Valim2011-10-023-8/+23
| | | | | | | | | | | | its own.
* | | Update CHANGELOG.José Valim2011-10-021-0/+2
| | |
* | | Merge pull request #2583 from guilleiguaran/railsrcJosé Valim2011-10-022-0/+14
|\ \ \ | | | | | | | | Read extra args for 'rails new' from ~/.railsrc
| * | | 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 pull request #3185 from arunagw/void_context_warnings_removedJosé Valim2011-10-011-1/+1
|\ \ \ | | | | | | | | Use of :: in void context Warning removed
| * | | 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.
| * | | 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
|\ \ \ | | | | | | | | Allow default options for `as_json` method on models
| * | | Fixing `as_json` method for ActiveRecord models.Nicolás Hock Isaza2011-09-292-1/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you've got an AR Model and you override the `as_json` method, you should be able to add default options to the renderer, like this: class User < ActiveRecord::Base def as_json(options = {}) super(options.merge(:except => [:password_digest])) end end This was not possible before this commit. See the added test case.
* | | Merge pull request #3177 from arunagw/void_warnings_removedJosé Valim2011-09-301-4/+4
|\ \ \ | | | | | | | | possibly useless use of :: in void context Warning removed
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 01:21:11 +0000