Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Refactor the handling of default_url_options in integration tests | Andrew White | 2012-05-10 | 2 | -7/+104 |
| | | | | | | | | | | | | This commit improves the handling of default_url_options in integration tests by making behave closer to how a real application operates. Specifically the following issues have been addressed: * Options specified in routes.rb are used (fixes #546) * Options specified in controllers are used * Request parameters are recalled correctly * Tests can override default_url_options directly | ||||
* | remove unnecessary 'examples' noise [ci skip] | Vijay Dev | 2012-05-11 | 2 | -28/+18 |
| | |||||
* | Merge pull request #6253 from rafmagana/master | José Valim | 2012-05-10 | 1 | -1/+1 |
|\ | | | | | remove duplicate usage of Rack::Utils.status_code in LogSubscriber#process_action | ||||
| * | remove duplicate usage of Rack::Utils.status_code in ↵ | Rafael Magana | 2012-05-10 | 1 | -1/+1 |
| | | | | | | | | LogSubscriber#process_action | ||||
* | | Merge pull request #6252 from grosser/unless_exist_for_memory_store | José Valim | 2012-05-10 | 2 | -0/+8 |
|\ \ | |/ |/| | add unless_exist option to memory store | ||||
| * | add unless_exist option to memory store | grosser | 2012-05-10 | 2 | -0/+8 |
|/ | |||||
* | Merge pull request #6244 from frodsan/fix_build_remove_key | José Valim | 2012-05-10 | 1 | -1/+1 |
|\ | | | | | Remove key argument from run_callbacks to fix build | ||||
| * | Remove key argument from run_callbacks to fix build | Francesco Rodriguez | 2012-05-10 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #6242 from frodsan/fix_abstract_controller | José Valim | 2012-05-10 | 1 | -1/+1 |
|\ | | | | | Removing key argument from run_callbacks method in abstract_controller | ||||
| * | removing key argument from run_callbacks - fix build | Francesco Rodriguez | 2012-05-10 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #6241 from frodsan/deprecate_key_callbacks | José Valim | 2012-05-10 | 4 | -6/+7 |
|\ | | | | | AS::Callbacks#run_callbacks remove key argument | ||||
| * | AS::Callbacks#run_callbacks remove key argument | Francesco Rodriguez | 2012-05-10 | 4 | -6/+7 |
|/ | |||||
* | Merge pull request #4254 from alexeymuranov/my-nicify-fixtures-rb | Jeremy Kemper | 2012-05-09 | 2 | -81/+82 |
|\ | | | | | Rename variables and remove unused code in fixtures.rb | ||||
| * | Rename some variables | Alexey Muranov | 2012-05-09 | 2 | -78/+82 |
| | | | | | | | | | | | | Rename some parameters and instance and local variables, mostly in fixtures.rb. Also remove an unused assignment to an instance variable. There are minor code changes. | ||||
| * | Remove unused private method in fixtures.rb | Alexey Muranov | 2012-05-09 | 1 | -3/+0 |
| | | | | | | | | Remove the unused private method ActiveRecord::Fixtures#yaml_fixtures_key(path). | ||||
| * | Remove unused parameter in ::instantiate_fixtures | Alexey Muranov | 2012-05-09 | 1 | -5/+5 |
| | | | | | | | | Second parameter of Fixtures::instantiate_fixtures was not used, so i removed it. | ||||
* | | Allow to run `connection_adapters/quoting_test.rb` independently | Piotr Sarnacki | 2012-05-09 | 1 | -1/+3 |
| | | |||||
* | | Merge pull request #5362 from zenprogrammer/quoting_bug | Aaron Patterson | 2012-05-09 | 2 | -0/+12 |
|\ \ | | | | | | | Fixed bug in ActiveRecord that caused classes to be quoted incorrectly | ||||
| * | | Fixed bug in Quoting that caused classes to be quoted incorrectly | Ryan Oblak | 2012-03-09 | 2 | -0/+12 |
| | | | |||||
* | | | Merge pull request #6226 from gnufied/master | Aaron Patterson | 2012-05-09 | 2 | -6/+33 |
|\ \ \ | | | | | | | | | Update tranasaction state when record gets commited | ||||
| * | | | make both cached and record_updated accessors in one line | Hemant Kumar | 2012-05-09 | 1 | -2/+1 |
| | | | | |||||
| * | | | after_commit :on => :update should be called when save is | Hemant Kumar | 2012-05-09 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | called from after_commit callback | ||||
| * | | | Fix transaction state not changing when after record gets commited | Hemant Kumar | 2012-05-09 | 2 | -6/+27 |
| | | | | |||||
* | | | | Merge pull request #6227 from mjtko/changelog-fixes | Vijay Dev | 2012-05-09 | 1 | -22/+33 |
|\ \ \ \ | |/ / / |/| | | | Updated activesupport CHANGELOG | ||||
| * | | | Consistent CHANGELOG entry indentation. | Mark J. Titorenko | 2012-05-09 | 1 | -22/+22 |
| | | | | |||||
| * | | | Add CHANGELOG section for unreleased Rails 3.2.4; document addition of ↵ | Mark J. Titorenko | 2012-05-09 | 1 | -0/+11 |
|/ / / | | | | | | | | | | #beginning_of_hour and #end_of_hour to Time and DateTime core extensions. | ||||
* | | | Refactor Generator class to not rely on in-place editing the controller | Andrew White | 2012-05-09 | 2 | -11/+16 |
| | | | |||||
* | | | Fix bug when url_for changes controller. | Nikita Beloglazov | 2012-05-09 | 2 | -2/+11 |
| |/ |/| | |||||
* | | fix a couple of formatting issues [ci skip] | Vijay Dev | 2012-05-09 | 1 | -2/+4 |
| | | |||||
* | | registers ceb1dcc in the CHANGELOG | Xavier Noria | 2012-05-09 | 1 | -0/+2 |
| | | |||||
* | | update some examples in asset tag helper docs [ci skip] | Vijay Dev | 2012-05-09 | 1 | -15/+15 |
| | | |||||
* | | remove redundant and stray line [ci skip] | Vijay Dev | 2012-05-09 | 1 | -2/+0 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-08 | 14 | -139/+356 |
|\ \ | |||||
| * | | simplify the alias_attribute example [ci skip] | Vijay Dev | 2012-05-08 | 1 | -20/+1 |
| | | | |||||
| * | | cut some duplication and minor edits [ci skip] | Vijay Dev | 2012-05-08 | 1 | -37/+4 |
| | | | |||||
| * | | Fix NumberHelper options wrapping to prevent verbatim blocks being rendered ↵ | Mark J. Titorenko | 2012-05-08 | 1 | -92/+161 |
| | | | | | | | | | | | | instead of line continuations. While I'm at it, wrap long comment lines consistently. | ||||
| * | | Add example for image_submit_tag with confirmation. [ci skip] | Edward Tsech | 2012-05-08 | 1 | -0/+3 |
| | | | |||||
| * | | Add annotaion for class_eval in AbstractController#helper_method [ci skip] | Edward Tsech | 2012-05-08 | 1 | -3/+3 |
| | | | |||||
| * | | Improve readability of metaprogramming annotations at AbstractController ↵ | Edward Tsech | 2012-05-08 | 1 | -10/+10 |
| | | | | | | | | | | | | callbacks. | ||||
| * | | added docs to alias_attribute method | Francesco Rodriguez | 2012-05-07 | 1 | -0/+31 |
| | | | |||||
| * | | added docs to cattr_reader | Francesco Rodriguez | 2012-05-07 | 1 | -0/+27 |
| | | | |||||
| * | | better docs for cattr_accessor and cattr_writer | Francesco Rodriguez | 2012-05-07 | 1 | -2/+14 |
| | | | |||||
| * | | added docs and examples to cattr_writer method | Francesco Rodriguez | 2012-05-07 | 1 | -5/+41 |
| | | | |||||
| * | | added docs to cattr_accessor method | Francesco Rodriguez | 2012-05-07 | 1 | -12/+50 |
| | | | |||||
| * | | adding example about using cattr_accessor with subclasses | Francesco Rodriguez | 2012-05-07 | 1 | -0/+8 |
| | | | |||||
| * | | Revert "fixing active model links in readme" | Vijay Dev | 2012-05-07 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit c962680e1902d2c9474f0be8ba7b0b8ab361cae6. Reason: The links must be relative to work in both edge and stable api sites. | ||||
| * | | Revert "Compressed all images from the guide through ImageOptim which saves ↵ | Xavier Noria | 2012-05-07 | 80 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes up to 74.6% in size [ci skip]" Reason: this change can't really be done in docrails, see http://weblog.rubyonrails.org/2012/3/7/what-is-docrails/ This reverts commit bc06e8d706fd8818d434c66f46d2e889ca24bd2d. | ||||
| * | | removing the surrounding +s in active model readme | Francesco Rodriguez | 2012-05-07 | 1 | -3/+3 |
| | | | |||||
| * | | Compressed all images from the guide through ImageOptim which saves ↵ | Ayrton De Craene | 2012-05-07 | 80 | -0/+0 |
| | | | | | | | | | | | | sometimes up to 74.6% in size [ci skip] | ||||
| * | | Doc for ActiveRecord::Result empty? method | Rob Zolkos | 2012-05-07 | 1 | -0/+1 |
| | | |