aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3625 from guilleiguaran/sprockets-2.1.0Jon Leighton2011-11-141-1/+1
|\
| * Upgrade Sprockets to 2.1.0Guillermo Iguaran2011-11-141-1/+1
* | Add note about syncing CHANGELOGsJon Leighton2011-11-141-0/+4
* | Sync CHANGELOGs from 3-1-stableJon Leighton2011-11-143-0/+42
* | Merge pull request #3622 from noefroidevaux/issue_3595Yehuda Katz2011-11-131-1/+1
|\ \
| * | Fix pull request #3609Noé Froidevaux2011-11-131-1/+1
| |/
* | Merge pull request #3623 from indirect/remote_ipJosé Valim2011-11-132-6/+6
|\ \
| * | remove ignored flag, fixes warningsAndre Arko2011-11-131-1/+1
| * | turns out the tests expect remote_addrs.firstAndre Arko2011-11-131-1/+1
| * | correctly raise IpSpoofAttackError messageAndre Arko2011-11-131-2/+2
| * | change tests to expect X-F-F over REMOTE_ADDRAndre Arko2011-11-131-2/+2
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-139-84/+100
|\ \
| * | copy edits in getting started guideVijay Dev2011-11-131-15/+12
| * | Revert "Move Tip up higher so users who are fine with SQLite can skip to the ...Vijay Dev2011-11-131-18/+16
| * | Revert "Use rails help new instead of rails new -h"Vijay Dev2011-11-131-1/+2
| * | Revert "Update guide to use Ruby 1.9 hash syntax"Vijay Dev2011-11-131-43/+45
| * | Update guide to use Ruby 1.9 hash syntaxJason Noble2011-11-131-45/+43
| * | Add output for add_index commandJason Noble2011-11-131-2/+4
| * | Convert tables to table formatJason Noble2011-11-131-10/+13
| * | Grammar changeJason Noble2011-11-131-1/+1
| * | Be explicit on where the show.html.erb is locatedJason Noble2011-11-131-1/+1
| * | Make the guide more friendlyJason Noble2011-11-131-8/+10
| * | Be explicit about changing codeJason Noble2011-11-131-2/+2
| * | p.errors.full_messages is a little more human readableJason Noble2011-11-131-4/+2
| * | Add link to AR Validations and Callbacks to further explain validationsJason Noble2011-11-131-1/+2
| * | Update wording to read betterJason Noble2011-11-131-1/+1
| * | Update wording to be more explicit on what the timestamp fields trackJason Noble2011-11-131-5/+5
| * | Update order so they show up in the order they do in the scaffolding outputJason Noble2011-11-131-7/+7
| * | Update wording to flow betterJason Noble2011-11-131-3/+3
| * | Fix typoJason Noble2011-11-131-1/+1
| * | Move Tip up higher so users who are fine with SQLite can skip to the next sec...Jason Noble2011-11-131-16/+18
| * | Updated wording to read betterJason Noble2011-11-131-3/+4
| * | Updated wording on what 'rails new blog' did for the userJason Noble2011-11-131-11/+11
| * | Use rails help new instead of rails new -hJason Noble2011-11-131-2/+1
| * | Move paragraphs to flow betterJason Noble2011-11-131-7/+15
| * | Add Tip about skipping to Section 3 if they want to come back to the philosop...Jason Noble2011-11-131-0/+4
| * | Fix bad English.Cheah Chu Yeow2011-11-131-1/+1
| * | Clearing cache in action caching is not "the exact same way" as with page cac...Cheah Chu Yeow2011-11-131-1/+1
| * | Suggest a workaround for page caching and parameters instead of an unhelpful ...Cheah Chu Yeow2011-11-131-1/+1
| * | Fix "in memory" where it should be "in-memory".Cheah Chu Yeow2011-11-133-4/+4
| * | For what it's worth; Update `memcache-client` gem namePrem Sichanugrist2011-11-111-1/+1
| * | Revert "Fix "in memory" where it should be "in-memory"."Vijay Dev2011-11-115-7/+7
| * | Update Memcached website to its new one at http://memcached.org/.Cheah Chu Yeow2011-11-111-1/+1
| * | Fix "in memory" where it should be "in-memory".Cheah Chu Yeow2011-11-115-7/+7
| * | update ci file name in contributing guideVijay Dev2011-11-111-1/+1
| * | fixed example code indentationWojciech Wnętrzak2011-11-101-6/+6
| * | Fix a tiny typo in custom validators documentationJean Boussier2011-11-101-1/+1
| * | Cosmetic fix in number_to_currency docsAlexey Vakhov2011-11-101-2/+2
* | | Merge pull request #3617 from indirect/remote_ipJosé Valim2011-11-132-53/+55
|\ \ \ | |_|/ |/| |
| * | defer calculating the remote IP until requestedAndre Arko2011-11-121-24/+36