Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3626 from guilleiguaran/include-therubyrhino-gemfile | José Valim | 2011-11-14 | 2 | -0/+8 |
|\ | | | | | Added therubyrhino to default Gemfile under JRuby | ||||
| * | Added therubyrhino to default Gemfile under JRuby | Guillermo Iguaran | 2011-11-14 | 2 | -0/+8 |
| | | |||||
* | | Merge pull request #3628 from oscardelben/refactoring | Yehuda Katz | 2011-11-14 | 1 | -1/+1 |
|\ \ | | | | | | | use any? instead of !empty? | ||||
| * | | use any? instead of !empty? | Oscar Del Ben | 2011-11-14 | 1 | -1/+1 |
| | | | |||||
* | | | Add a note to REALEASING_RAILS about testing the gem locally before releasing | Jon Leighton | 2011-11-14 | 1 | -0/+9 |
| | | | |||||
* | | | rake release should push the tag | Jon Leighton | 2011-11-14 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #3371 from yahonda/fix_ora_00932_error | Aaron Patterson | 2011-11-14 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix ORA-00932 error when trying to insert 0 to DATE type columns. | ||||
| * | | | Fix ORA-00932 error when trying to insert 0 to DATE type columns. | Yasuo Honda | 2011-10-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Sync changelog entry | Jon Leighton | 2011-11-14 | 1 | -0/+2 |
| | | | | |||||
* | | | | Add note about checking postgres tests before release | Jon Leighton | 2011-11-14 | 1 | -0/+8 |
| |/ / |/| | | |||||
* | | | Merge pull request #3625 from guilleiguaran/sprockets-2.1.0 | Jon Leighton | 2011-11-14 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Upgrade Sprockets to 2.1.0 | ||||
| * | | | Upgrade Sprockets to 2.1.0 | Guillermo Iguaran | 2011-11-14 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | This version brings bug fixes for performance and caching. | ||||
* | | | Add note about syncing CHANGELOGs | Jon Leighton | 2011-11-14 | 1 | -0/+4 |
| | | | |||||
* | | | Sync CHANGELOGs from 3-1-stable | Jon Leighton | 2011-11-14 | 3 | -0/+42 |
| | | | |||||
* | | | Merge pull request #3622 from noefroidevaux/issue_3595 | Yehuda Katz | 2011-11-13 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix pull request #3609 | ||||
| * | | | Fix pull request #3609 | Noé Froidevaux | 2011-11-13 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #3623 from indirect/remote_ip | José Valim | 2011-11-13 | 2 | -6/+6 |
|\ \ \ | | | | | | | | | Remote IP fixes/cleanup | ||||
| * | | | remove ignored flag, fixes warnings | Andre Arko | 2011-11-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | turns out the tests expect remote_addrs.first | Andre Arko | 2011-11-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | correctly raise IpSpoofAttackError message | Andre Arko | 2011-11-13 | 1 | -2/+2 |
| | | | | |||||
| * | | | change tests to expect X-F-F over REMOTE_ADDR | Andre Arko | 2011-11-13 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-13 | 9 | -84/+100 |
|\ \ \ | |||||
| * | | | copy edits in getting started guide | Vijay Dev | 2011-11-13 | 1 | -15/+12 |
| | | | | |||||
| * | | | Revert "Move Tip up higher so users who are fine with SQLite can skip to the ↵ | Vijay Dev | 2011-11-13 | 1 | -18/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | next section" This reverts commit 4bf057b8661754948681a18cf17ff5676518d774. Reason: Prefer to keep the configuration of all databases at the same level | ||||
| * | | | Revert "Use rails help new instead of rails new -h" | Vijay Dev | 2011-11-13 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | This reverts commit 6ac65c92029d3eefd101f9458d86bae0314cd14c. | ||||
| * | | | Revert "Update guide to use Ruby 1.9 hash syntax" | Vijay Dev | 2011-11-13 | 1 | -43/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 50a9de514f8724b04d3681aa9ca228a8ca490909. Reason: Let's keep the guides at 1.8 syntax | ||||
| * | | | Update guide to use Ruby 1.9 hash syntax | Jason Noble | 2011-11-13 | 1 | -45/+43 |
| | | | | |||||
| * | | | Add output for add_index command | Jason Noble | 2011-11-13 | 1 | -2/+4 |
| | | | | |||||
| * | | | Convert tables to table format | Jason Noble | 2011-11-13 | 1 | -10/+13 |
| | | | | |||||
| * | | | Grammar change | Jason Noble | 2011-11-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Be explicit on where the show.html.erb is located | Jason Noble | 2011-11-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Make the guide more friendly | Jason Noble | 2011-11-13 | 1 | -8/+10 |
| | | | | | | | | | | | | - Changed Rails 3.0 to 3.0+ | ||||
| * | | | Be explicit about changing code | Jason Noble | 2011-11-13 | 1 | -2/+2 |
| | | | | |||||
| * | | | p.errors.full_messages is a little more human readable | Jason Noble | 2011-11-13 | 1 | -4/+2 |
| | | | | |||||
| * | | | Add link to AR Validations and Callbacks to further explain validations | Jason Noble | 2011-11-13 | 1 | -1/+2 |
| | | | | |||||
| * | | | Update wording to read better | Jason Noble | 2011-11-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update wording to be more explicit on what the timestamp fields track | Jason Noble | 2011-11-13 | 1 | -5/+5 |
| | | | | |||||
| * | | | Update order so they show up in the order they do in the scaffolding output | Jason Noble | 2011-11-13 | 1 | -7/+7 |
| | | | | |||||
| * | | | Update wording to flow better | Jason Noble | 2011-11-13 | 1 | -3/+3 |
| | | | | |||||
| * | | | Fix typo | Jason Noble | 2011-11-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Move Tip up higher so users who are fine with SQLite can skip to the next ↵ | Jason Noble | 2011-11-13 | 1 | -16/+18 |
| | | | | | | | | | | | | | | | | section | ||||
| * | | | Updated wording to read better | Jason Noble | 2011-11-13 | 1 | -3/+4 |
| | | | | |||||
| * | | | Updated wording on what 'rails new blog' did for the user | Jason Noble | 2011-11-13 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | - Alphabetized the files/folders created - Added link to Configuring Rails Applications | ||||
| * | | | Use rails help new instead of rails new -h | Jason Noble | 2011-11-13 | 1 | -2/+1 |
| | | | | |||||
| * | | | Move paragraphs to flow better | Jason Noble | 2011-11-13 | 1 | -7/+15 |
| | | | | | | | | | | | | - Give the user a way to know they are fully installed and ready to continue | ||||
| * | | | Add Tip about skipping to Section 3 if they want to come back to the ↵ | Jason Noble | 2011-11-13 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | philosophy later | ||||
| * | | | Fix bad English. | Cheah Chu Yeow | 2011-11-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Clearing cache in action caching is not "the exact same way" as with page ↵ | Cheah Chu Yeow | 2011-11-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | caching. | ||||
| * | | | Suggest a workaround for page caching and parameters instead of an unhelpful ↵ | Cheah Chu Yeow | 2011-11-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | warning. | ||||
| * | | | Fix "in memory" where it should be "in-memory". | Cheah Chu Yeow | 2011-11-13 | 3 | -4/+4 |
| | | | |