Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5425 from rafaelfranca/remove_key_value | José Valim | 2012-03-14 | 10 | -37/+23 |
|\ | | | | | Remove key_value helper now that master is 1.9 only and we always use the 1.9 hash syntax in the generators. | ||||
| * | Remove key_value helper now that master is 1.9 only and we always use | Rafael Mendonça França | 2012-03-13 | 10 | -37/+23 |
|/ | | | | the 1.9 hash syntax in the generators. | ||||
* | Update API guide with latest decisions. | José Valim | 2012-03-14 | 1 | -10/+8 |
| | |||||
* | [engines guide] Add information about running and reverting specified ↵ | Piotr Sarnacki | 2012-03-14 | 1 | -4/+16 |
| | | | | migrations [skip ci] | ||||
* | Merge pull request #5261 from carlosantoniodasilva/identity-map-removal | José Valim | 2012-03-13 | 34 | -966/+49 |
|\ | | | | | Remove IdentityMap | ||||
| * | Expand changelog and upgrading rails guide with IdentityMap info | Carlos Antonio da Silva | 2012-03-13 | 2 | -1/+14 |
| | | |||||
| * | Remove IdentityMap | Carlos Antonio da Silva | 2012-03-13 | 33 | -966/+36 |
|/ | |||||
* | Merge pull request #5409 from rails/sprockets-rails | José Valim | 2012-03-13 | 31 | -985/+15 |
|\ | | | | | Remove sprockets integration from actionpack | ||||
| * | Add sprockets-rails to generated Gemfile. This should be reverted after ↵ | Guillermo Iguaran | 2012-03-13 | 1 | -0/+2 |
| | | | | | | | | sprockets-rails release on rubygems | ||||
| * | Depend on sprockets-rails v1.0 | Guillermo Iguaran | 2012-03-13 | 1 | -6/+7 |
| | | |||||
| * | The sprockets railtie was moved to sprockets/rails/railtie | Guillermo Iguaran | 2012-03-13 | 4 | -4/+4 |
| | | |||||
| * | Remove remaining sprockets tests | Guillermo Iguaran | 2012-03-13 | 1 | -28/+0 |
| | | |||||
| * | Remove sprockets dependency on actionpack | Guillermo Iguaran | 2012-03-13 | 1 | -1/+0 |
| | | |||||
| * | Add sprockets-rails to rails project Gemfile | Guillermo Iguaran | 2012-03-13 | 1 | -0/+2 |
| | | |||||
| * | Remove tests and fixtures for Sprockets on ActionPack | Guillermo Iguaran | 2012-03-13 | 14 | -409/+0 |
| | | |||||
| * | Remove sprockets integration on ActionPack | Guillermo Iguaran | 2012-03-13 | 8 | -537/+0 |
| | | |||||
* | | Remove ARes from the list. | José Valim | 2012-03-14 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #5415 from rafaelfranca/refactor | José Valim | 2012-03-13 | 3 | -9/+9 |
|\ | | | | | Refactor the test_unit scaffold generator to use the key_value method | ||||
| * | Refactor the test_unit scaffold generator to use the key_value method | Rafael Mendonça França | 2012-03-13 | 3 | -9/+9 |
| | | |||||
* | | Merge pull request #572 from sikachu/remove_activeresource | José Valim | 2012-03-13 | 68 | -7147/+13 |
|\ \ | | | | | | | Remove Active Resource source files from the repository. | ||||
| * | | Remove Active Resource source files from the repository | Prem Sichanugrist | 2012-03-13 | 68 | -7147/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dear Active Resource, It's not that I hate you or anything, but you didn't get much attention lately. There're so many alternatives out there, and I think people have made their choice to use them than you. I think it's time for you to have a big rest, peacefully in this Git repository. I will miss you, @sikachu. | ||||
* | | | Merge pull request #5420 from lest/patch-2 | Piotr Sarnacki | 2012-03-13 | 2 | -2/+13 |
|\ \ \ | | | | | | | | | add include_hidden option to checkbox tag | ||||
| * | | | add include_hidden option to checkbox tag | Sergey Nartimov | 2012-03-13 | 2 | -2/+13 |
| |/ / | |||||
* | | | Check for existence of exactly the called `fixture_path=` method | Piotr Sarnacki | 2012-03-13 | 1 | -2/+2 |
| | | | |||||
* | | | Environment in engines tests is required on boot_rails, no need to require ↵ | Piotr Sarnacki | 2012-03-13 | 1 | -10/+0 |
| | | | | | | | | | | | | explicitly | ||||
* | | | Don't need to share engine's tests anymore, plugins are gone | Piotr Sarnacki | 2012-03-13 | 2 | -370/+359 |
| | | | |||||
* | | | Ensure that engine can be mounted at root (#4314) | Piotr Sarnacki | 2012-03-13 | 1 | -0/+54 |
|/ / | | | | | | | | | | | | | It's already fixed and the fix was actually in journey library, but with #4314 it reappeared second time, so probably this kind of integration test will be good to have to not allow it to sneak in after changes in journey or rails itself. | ||||
* | | Merge pull request #5419 from nashby/patch-1 | José Valim | 2012-03-13 | 1 | -1/+1 |
|\ \ | | | | | | | fix typo in AP CHANGELOG [ci skip] | ||||
| * | | fix typo in AP CHANGELOG [ci skip] | Vasiliy Ermolovich | 2012-03-13 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-13 | 17 | -129/+260 |
|\ \ | |||||
| * | | Fix AM Guide | Alexey Vakhov | 2012-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | | Use proc as default argument to recaculate recipients array every time | ||||
| * | | mark engines guide as wip [ci skip] | Vijay Dev | 2012-03-13 | 1 | -0/+1 |
| | | | |||||
| * | | Revert "Fixed Issue #2884 ActiveModel::SecurePassword code / rdoc conflict; ↵ | Vijay Dev | 2012-03-13 | 2 | -17/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | an elucidated explanation has been provided and ActiveModel en-locale updated to present a less confusing attribute name for 'password_digest' in form errors due to "has_secure_password"" This reverts commit ddbea9474e20a40e80110944c1e3493ba0efe572. Reason: Includes non-doc changes. | ||||
| * | | copy-edit contributing guide [ci skip] | Vijay Dev | 2012-03-13 | 1 | -2/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' | Mark Thomson | 2012-03-13 | 9 | -49/+86 |
| |\ \ | |||||
| | * | | [config guide] Add mass_assignment_sanitizer to Active Record config options | Ryan Bigg | 2012-03-12 | 1 | -0/+2 |
| | | | | |||||
| | * | | Advise to keep secret token private | Filipe Moreira | 2012-03-12 | 1 | -0/+2 |
| | | | | |||||
| | * | | Advise to keep secret token private | Filipe Moreira | 2012-03-12 | 1 | -0/+2 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'original_repo/master' | Avi Tzurel | 2012-03-12 | 11 | -117/+208 |
| | |\ \ | |||||
| | | * | | Add engines guide to documents.yaml | Ryan Bigg | 2012-03-11 | 1 | -0/+4 |
| | | | | | |||||
| | | * | | [instrumentation] Add further action placeholders | Ryan Bigg | 2012-03-11 | 1 | -0/+12 |
| | | | | | |||||
| | | * | | [instrumentation guide] Cover deliver.action_mailer event | Ryan Bigg | 2012-03-11 | 1 | -0/+18 |
| | | | | | |||||
| | | * | | [instrumentation guide] Cover receive.action_mailer event | Ryan Bigg | 2012-03-11 | 1 | -0/+27 |
| | | | | | |||||
| | | * | | Fixed Issue #2884 ActiveModel::SecurePassword code / rdoc conflict; an ↵ | Michael de Silva | 2012-03-11 | 2 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | elucidated explanation has been provided and ActiveModel en-locale updated to present a less confusing attribute name for 'password_digest' in form errors due to "has_secure_password" | ||||
| | | * | | attr_accessor_with_default was deprecated and removed. | Andrew France | 2012-03-11 | 1 | -49/+0 |
| | | | | | | | | | | | | | | | Deprecated in 673372152032a886ba9196c69348386834590eab and removed in 9cafc28874a681082f9f7e1e445db91f195a25ae. | ||||
| | * | | | Squash commits into a single commit | Avi Tzurel | 2012-03-11 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Added documentation for the ActionController::MimeResponds::Collector class. | Mark Thomson | 2012-03-13 | 1 | -1/+24 |
| | |/ / | |/| | | |||||
| * | | | Revised explanation of fields_for usage. | Mark Thomson | 2012-03-11 | 1 | -10/+39 |
| | | | | | | | | | | | | | | | | Minor tweak to previous comments on form_for and form_helper.rb preamble | ||||
| * | | | added clarification stating the counter_cache attribute needs to be created ↵ | Michael de Silva | 2012-03-11 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | on the associate class via a migration | ||||
| * | | | Added clarification to description of how initial form values are derived. | Mark Thomson | 2012-03-10 | 1 | -1/+2 |
| | | | |