aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5425 from rafaelfranca/remove_key_valueJosé Valim2012-03-1410-37/+23
|\
| * Remove key_value helper now that master is 1.9 only and we always useRafael Mendonça França2012-03-1310-37/+23
|/
* Update API guide with latest decisions.José Valim2012-03-141-10/+8
* [engines guide] Add information about running and reverting specified migrati...Piotr Sarnacki2012-03-141-4/+16
* Merge pull request #5261 from carlosantoniodasilva/identity-map-removalJosé Valim2012-03-1334-966/+49
|\
| * Expand changelog and upgrading rails guide with IdentityMap infoCarlos Antonio da Silva2012-03-132-1/+14
| * Remove IdentityMapCarlos Antonio da Silva2012-03-1333-966/+36
|/
* Merge pull request #5409 from rails/sprockets-railsJosé Valim2012-03-1331-985/+15
|\
| * Add sprockets-rails to generated Gemfile. This should be reverted after sproc...Guillermo Iguaran2012-03-131-0/+2
| * Depend on sprockets-rails v1.0Guillermo Iguaran2012-03-131-6/+7
| * The sprockets railtie was moved to sprockets/rails/railtieGuillermo Iguaran2012-03-134-4/+4
| * Remove remaining sprockets testsGuillermo Iguaran2012-03-131-28/+0
| * Remove sprockets dependency on actionpackGuillermo Iguaran2012-03-131-1/+0
| * Add sprockets-rails to rails project GemfileGuillermo Iguaran2012-03-131-0/+2
| * Remove tests and fixtures for Sprockets on ActionPackGuillermo Iguaran2012-03-1314-409/+0
| * Remove sprockets integration on ActionPackGuillermo Iguaran2012-03-138-537/+0
* | Remove ARes from the list.José Valim2012-03-141-1/+1
|/
* Merge pull request #5415 from rafaelfranca/refactorJosé Valim2012-03-133-9/+9
|\
| * Refactor the test_unit scaffold generator to use the key_value methodRafael Mendonça França2012-03-133-9/+9
* | Merge pull request #572 from sikachu/remove_activeresourceJosé Valim2012-03-1368-7147/+13
|\ \
| * | Remove Active Resource source files from the repositoryPrem Sichanugrist2012-03-1368-7147/+13
* | | Merge pull request #5420 from lest/patch-2Piotr Sarnacki2012-03-132-2/+13
|\ \ \
| * | | add include_hidden option to checkbox tagSergey Nartimov2012-03-132-2/+13
| |/ /
* | | Check for existence of exactly the called `fixture_path=` methodPiotr Sarnacki2012-03-131-2/+2
* | | Environment in engines tests is required on boot_rails, no need to require ex...Piotr Sarnacki2012-03-131-10/+0
* | | Don't need to share engine's tests anymore, plugins are gonePiotr Sarnacki2012-03-132-370/+359
* | | Ensure that engine can be mounted at root (#4314)Piotr Sarnacki2012-03-131-0/+54
|/ /
* | Merge pull request #5419 from nashby/patch-1José Valim2012-03-131-1/+1
|\ \
| * | fix typo in AP CHANGELOG [ci skip]Vasiliy Ermolovich2012-03-131-1/+1
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-1317-129/+260
|\ \
| * | Fix AM GuideAlexey Vakhov2012-03-131-1/+1
| * | mark engines guide as wip [ci skip]Vijay Dev2012-03-131-0/+1
| * | Revert "Fixed Issue #2884 ActiveModel::SecurePassword code / rdoc conflict; a...Vijay Dev2012-03-132-17/+0
| * | copy-edit contributing guide [ci skip]Vijay Dev2012-03-131-2/+2
| * | Merge remote-tracking branch 'origin/master'Mark Thomson2012-03-139-49/+86
| |\ \
| | * | [config guide] Add mass_assignment_sanitizer to Active Record config optionsRyan Bigg2012-03-121-0/+2
| | * | Advise to keep secret token privateFilipe Moreira2012-03-121-0/+2
| | * | Advise to keep secret token privateFilipe Moreira2012-03-121-0/+2
| | * | Merge remote-tracking branch 'original_repo/master'Avi Tzurel2012-03-1211-117/+208
| | |\ \
| | | * | Add engines guide to documents.yamlRyan Bigg2012-03-111-0/+4
| | | * | [instrumentation] Add further action placeholdersRyan Bigg2012-03-111-0/+12
| | | * | [instrumentation guide] Cover deliver.action_mailer eventRyan Bigg2012-03-111-0/+18
| | | * | [instrumentation guide] Cover receive.action_mailer eventRyan Bigg2012-03-111-0/+27
| | | * | Fixed Issue #2884 ActiveModel::SecurePassword code / rdoc conflict; an elucid...Michael de Silva2012-03-112-0/+17
| | | * | attr_accessor_with_default was deprecated and removed. Andrew France2012-03-111-49/+0
| | * | | Squash commits into a single commitAvi Tzurel2012-03-111-0/+2
| * | | | Added documentation for the ActionController::MimeResponds::Collector class.Mark Thomson2012-03-131-1/+24
| | |/ / | |/| |
| * | | Revised explanation of fields_for usage.Mark Thomson2012-03-111-10/+39
| * | | added clarification stating the counter_cache attribute needs to be created o...Michael de Silva2012-03-111-1/+3
| * | | Added clarification to description of how initial form values are derived.Mark Thomson2012-03-101-1/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-16 23:50:37 +0000