Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Fix failing tests and refactor assets.rake | José Valim | 2011-10-04 | 2 | -25/+38 | |
| | | | ||||||
* | | | Changing rake db:schema:dump to run :environment as well as :load_config, as ↵ | Ben Woosley | 2011-10-04 | 1 | -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-headers | José Valim | 2011-10-03 | 2 | -1/+15 | |
|\ \ | | | | | | | Use rack-cache 1.1 | |||||
| * | | Require rack-cache 1.1. | Brendan Ribera | 2011-10-03 | 1 | -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 Ribera | 2011-10-03 | 1 | -0/+14 | |
|/ / | ||||||
* | | Merge pull request #2801 from jeremyevans/patch-1 | Jeremy Kemper | 2011-10-03 | 2 | -1/+4 | |
|\ \ | | | | | | | Fix obviously breakage of Time.=== for Time subclasses | |||||
| * | | Add tests for fixes to Time.=== | Jeremy Evans | 2011-09-07 | 1 | -0/+3 | |
| | | | ||||||
| * | | Edited activesupport/lib/active_support/core_ext/time/calculations.rb via GitHub | Jeremy Evans | 2011-09-01 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #3191 from yahonda/activerecord_unittest_db2 | Aaron Patterson | 2011-10-03 | 2 | -0/+5 | |
|\ \ \ | | | | | | | | | To support ActiveRecord unit tests for IBM DB2 | |||||
| * | | | Fix typo in Rakefile | Yasuo Honda | 2011-10-03 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | To support ActiveRecord unit tests for IBM DB2 | Yasuo Honda | 2011-10-02 | 2 | -0/+5 | |
| | | | | ||||||
* | | | | Fix #3198. | José Valim | 2011-10-03 | 1 | -39/+35 | |
| | | | | ||||||
* | | | | add failing test for #3198 | Mark J. Titorenko | 2011-10-03 | 1 | -0/+13 | |
| | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | | | Merge pull request #3200 from docwhat/spelling-booboo | Santiago Pastorino | 2011-10-03 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Rescuable spelling error | |||||
| * | | | | Rescuable spelling error | Christian Höltje | 2011-10-03 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Ensure that enhancements to assets:precompile task are only run once | Sam Pohlenz | 2011-10-03 | 2 | -0/+8 | |
| | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | | | Replace calls to capture(:stdout) with quietly in assets tests | Sam Pohlenz | 2011-10-03 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | | | Merge pull request #3193 from avakhov/patch-ac-test-case-safe-constantize | José Valim | 2011-10-03 | 1 | -3/+1 | |
|\ \ \ \ | | | | | | | | | | | use safe_constantize instead constantize in AC::TestCase | |||||
| * | | | | use safe_constantize instead constantize in AC::TestCase | Alexey Vakhov | 2011-10-03 | 1 | -3/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #3194 from avakhov/patch-ac-test-case-tests | José Valim | 2011-10-03 | 2 | -2/+30 | |
|\ \ \ \ | |/ / / |/| | | | normalize arg for AC::TestCase tests class method | |||||
| * | | | normalize arg for AC::TestCase tests class method | Alexey Vakhov | 2011-10-03 | 2 | -2/+30 | |
|/ / / | ||||||
* | | | :group => :assets should only run in the assets environment. | José Valim | 2011-10-02 | 5 | -7/+8 | |
| | | | ||||||
* | | | rewords the docs of config.assets.initialize_on_precompile in the asset ↵ | Xavier Noria | 2011-10-02 | 1 | -6/+8 | |
| | | | | | | | | | | | | pipeline guide | |||||
* | | | documents config.assets.initialize_on_precompile in the asset pipeline guide | Xavier Noria | 2011-10-02 | 1 | -0/+7 | |
| | | | ||||||
* | | | Precompile properly refers files referenced with asset_path test | Santiago Pastorino | 2011-10-02 | 1 | -1/+3 | |
| | | | ||||||
* | | | capture was commented out | Santiago Pastorino | 2011-10-02 | 1 | -2/+2 | |
| | | | ||||||
* | | | Provide initialize_on_precompile which, when set to false, does not ↵ | José Valim | 2011-10-02 | 4 | -16/+45 | |
| | | | | | | | | | | | | initialize the app for precompilation. Defaults to true. | |||||
* | | | Merge pull request #3174 from phuibonhoa/master | José Valim | 2011-10-02 | 2 | -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 Huibonhoa | 2011-10-02 | 1 | -4/+5 | |
| | | | | | | | | | | | | | | | | method. | |||||
| * | | | Added fix so that file store does not raise an exception when cache dir does ↵ | Philippe Huibonhoa | 2011-09-29 | 2 | -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é Valim | 2011-10-02 | 3 | -8/+23 | |
| | | | | | | | | | | | | | | | | its own. | |||||
* | | | | Update CHANGELOG. | José Valim | 2011-10-02 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Merge pull request #2583 from guilleiguaran/railsrc | José Valim | 2011-10-02 | 2 | -0/+14 | |
|\ \ \ \ | | | | | | | | | | | Read extra args for 'rails new' from ~/.railsrc | |||||
| * | | | | Print information about .railsrc to users | Guillermo Iguaran | 2011-10-02 | 2 | -0/+7 | |
| | | | | | ||||||
| * | | | | Read extra args for 'rails new' from ~/.railsrc | Guillermo Iguaran | 2011-10-02 | 1 | -0/+7 | |
|/ / / / | ||||||
* | | | | Merge pull request #3185 from arunagw/void_context_warnings_removed | José Valim | 2011-10-01 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Use of :: in void context Warning removed | |||||
| * | | | | Use of :: in void context Warning removed | Arun Agrawal | 2011-10-01 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #3181 from yahonda/fix_uninitialized_constant_testfixtures | José Valim | 2011-09-30 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Modified how to handle if ActiveRecord is defined. | |||||
| * | | | | Modified how to handle if ActiveRecord is defined. | Yasuo Honda | 2011-09-30 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Provide read_attribute_for_serialization as the API to serialize attributes. | José Valim | 2011-09-30 | 3 | -5/+30 | |
| | | | | ||||||
* | | | | Set the default options value for as_json in the encoder object. | José Valim | 2011-09-30 | 2 | -3/+3 | |
| | | | | ||||||
* | | | | Merge pull request #3175 from nhocki/as-json-patch | José Valim | 2011-09-30 | 2 | -1/+11 | |
|\ \ \ \ | | | | | | | | | | | Allow default options for `as_json` method on models | |||||
| * | | | | Fixing `as_json` method for ActiveRecord models. | Nicolás Hock Isaza | 2011-09-29 | 2 | -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_removed | José Valim | 2011-09-30 | 1 | -4/+4 | |
|\ \ \ \ | | | | | | | | | | | possibly useless use of :: in void context Warning removed | |||||
| * | | | | possibly useless use of :: in void context Warning removed | Arun Agrawal | 2011-09-30 | 1 | -4/+4 | |
| |/ / / | ||||||
* | | | | Merge pull request #3178 from arunagw/argument_warning_removed | José Valim | 2011-09-30 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | warning removed : '&' interpreted as argument prefix | |||||
| * | | | warning removed : '&' interpreted as argument prefix | Arun Agrawal | 2011-09-30 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Add CHANGELOG entries | Santiago Pastorino | 2011-09-29 | 3 | -1/+67 | |
| | | | ||||||
* | | | Don't call self.class unless necessary. Closes #3171. | Jon Leighton | 2011-09-29 | 2 | -2/+3 | |
| | | | ||||||
* | | | Merge pull request #3167 from ↵ | José Valim | 2011-09-29 | 2 | -1/+17 | |
|\ \ \ | | | | | | | | | | | | | | | | | dmitriy-kiriyenko/honour_rails_env_environment_variable_when_running_rake RAILS_ENV environment variable is ignored when running rake from thor script using Rails::Generators::Actions |