aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make enhanced routing Concerns more tell-don't-askErnie Miller2012-09-032-37/+70
* Fix concerns not executing block in mapperErnie Miller2012-09-032-2/+29
* Allow routing concerns to accept a callableErnie Miller2012-09-033-5/+34
* Merge pull request #7506 from senny/issue_7503Rafael Mendonça França2012-09-035-2/+38
|\
| * set the configured #inheritance_column on #become (#7503)Yves Senn2012-09-035-2/+38
* | Merge pull request #7502 from xoen/fixed-upgrading-guide-markupCarlos Antonio da Silva2012-09-021-2/+12
|\ \
| * | Fixed markup in Upgrading RoR guide [ci skip]Aldo "xoen" Giambelluca2012-09-021-2/+12
| |/
* | Merge pull request #7504 from behrends/patch-1Carlos Antonio da Silva2012-09-021-1/+1
|\ \ | |/ |/|
| * Fix example code: use tasks instead of commentsErik Behrends2012-09-021-1/+1
|/
* Merge pull request #7495 from steveklabnik/issue_7478Aaron Patterson2012-09-013-4/+18
|\
| * Force reloading of the session after destroyAndreas Loupasakis2012-09-011-0/+3
| * Override rack's destroy_session in cookie storeAndreas Loupasakis2012-09-011-0/+8
| * Assign a new session_id to session options hashAndreas Loupasakis2012-09-011-2/+2
| * Properly reset the session on reset_sessionSteve Klabnik2012-08-311-2/+5
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-0117-36/+111
|\ \
| * | copy edits [ci skip]Vijay Dev2012-09-012-4/+2
| * | Revert "added .DS_Store to .gitignore"Vijay Dev2012-09-011-1/+0
| * | reverting changes from commit b0896c38Sven Kraeuter | 5v3n2012-09-011-1/+1
| * | Fix comment about Session.Steve Klabnik2012-08-311-1/+1
| * | Fix my bioPratik Naik2012-08-311-1/+1
| * | Merge pull request #111 from 5v3n/masterSven Kräuter2012-08-311-1/+1
| |\ \
| | * | there is no "delete" action in a controllerSven Kräuter2012-08-311-1/+1
| |/ /
| * | In example about params naming conventions use params[:person] [ci skip]Aldo "xoen" Giambelluca2012-08-311-1/+1
| * | Merge pull request #106 from neilstockbridge/masterJeff Shantz2012-08-301-1/+1
| |\ \
| | * | Added a note for smtp_settings.enable_starttls_autoNeil Stockbridge2012-08-081-1/+1
| * | | in section 4.1 acts_as_yaffle_test was incorrectly failing due to assertion i...Kevin Musiorski2012-08-301-2/+2
| * | | added .DS_Store to .gitignoreKevin Musiorski2012-08-301-0/+1
| * | | Added example of using options_for_select() with select_tag()Kir Shatrov2012-08-301-0/+4
| * | | Removed spaces between name and asterisks in example CHANGELOG entry [ci skip]Aldo "xoen" Giambelluca2012-08-301-1/+1
| * | | Expand documentation for change() method in Time, Date, and DateTimeJeff Shantz2012-08-293-4/+15
| * | | Revert "Grammar"Jo Liss2012-08-301-3/+3
| * | | GrammarJo Liss2012-08-291-3/+3
| * | | Merge pull request #110 from nmadura/masterNathaniel Madura2012-08-291-0/+3
| |\ \ \
| | * | | added a touch more information to the apache configuration instructionsNathaniel Madura2012-08-291-0/+3
| |/ / /
| * | | Merge pull request #109 from aantix/default_security_headers_clarificationsJim Jones2012-08-281-1/+19
| |\ \ \
| | * | | Added clairifications for default security headers.Jim Jones2012-08-271-1/+19
| |/ / /
| * | | Merge pull request #108 from homakov/masterEgor Homakov2012-08-271-0/+23
| |\ \ \
| | * | | default headers initEgor Homakov2012-08-271-0/+23
| |/ / /
| * | | Update guides/source/rails_application_templates.textileDeepak Kannan2012-08-271-1/+1
| * | | Minor update for usage of git commandDeepak Kannan2012-08-271-1/+1
| * | | Guide: improvements to "The Flash" section.Henrik N2012-08-251-9/+22
| * | | Merge pull request #107 from jaimeiniesta/masterXavier Noria2012-08-241-8/+13
| |\ \ \
| | * | | Add exception handling to rake guides:validateJaime Iniesta2012-08-241-1/+6
| | * | | Fix rake guides:validateJaime Iniesta2012-08-241-7/+7
| |/ / /
| * | | Revert "Fix rake guides:validate task as it should be run from the guides dir...Jaime Iniesta2012-08-241-13/+8
| * | | Merge branch 'master' of github.com:lifo/docrailsAlmudena Garcia2012-08-231-8/+13
| |\ \ \
| | * | | Fix rake guides:validate task as it should be run from the guides directory; ...Jaime Iniesta2012-08-231-8/+13
| * | | | Fix HTML validation errorsAlmudena Garcia2012-08-234-7/+7
| |/ / /
* | | | require bundle in the app generatorXavier Noria2012-09-011-0/+1
* | | | Remove unneeded requirePiotr Sarnacki2012-09-011-1/+0