Commit Graph

25966 Commits

Author SHA1 Message Date
Jon Leighton 156784fef1 rake release should push the tag 2011-11-14 16:55:31 +00:00
Aaron Patterson 11c9fc9364 Merge pull request #3371 from yahonda/fix_ora_00932_error
Fix ORA-00932 error when trying to insert 0 to DATE type columns.
2011-11-14 04:36:55 -08:00
Jon Leighton ca3b468937 Sync changelog entry 2011-11-14 12:23:43 +00:00
Jon Leighton 4d8081b6e7 Add note about checking postgres tests before release 2011-11-14 12:17:13 +00:00
Jon Leighton d023078b95 Merge pull request #3625 from guilleiguaran/sprockets-2.1.0
Upgrade Sprockets to 2.1.0
2011-11-14 03:40:17 -08:00
Jon Leighton c7b84689a4 Add note about syncing CHANGELOGs 2011-11-14 11:29:57 +00:00
Jon Leighton da02f792fe Sync CHANGELOGs from 3-1-stable 2011-11-14 11:28:12 +00:00
Guillermo Iguaran e0eb2292bb Upgrade Sprockets to 2.1.0
This version brings bug fixes for performance and caching.
2011-11-14 06:25:03 -05:00
Yehuda Katz 2ec8d52b0c Merge pull request #3622 from noefroidevaux/issue_3595
Fix pull request #3609
2011-11-13 13:38:45 -08:00
José Valim d37e169856 Merge pull request #3623 from indirect/remote_ip
Remote IP fixes/cleanup
2011-11-13 12:34:23 -08:00
Andre Arko 9c4532bf74 remove ignored flag, fixes warnings 2011-11-13 10:22:12 -10:00
Andre Arko 2d063c6269 turns out the tests expect remote_addrs.first 2011-11-13 10:20:55 -10:00
Andre Arko 2189bff732 correctly raise IpSpoofAttackError message 2011-11-13 10:20:29 -10:00
Andre Arko 8f0085a483 change tests to expect X-F-F over REMOTE_ADDR 2011-11-13 10:19:54 -10:00
Vijay Dev e0efe48c45 Merge branch 'master' of github.com:lifo/docrails 2011-11-13 22:29:26 +05:30
Vijay Dev 30122307a1 copy edits in getting started guide 2011-11-13 22:27:44 +05:30
Vijay Dev af51409de4 Revert "Move Tip up higher so users who are fine with SQLite can skip to the next section"
This reverts commit 4bf057b866.

Reason: Prefer to keep the configuration of all databases at the same
level
2011-11-13 22:07:54 +05:30
Vijay Dev c8c08bd000 Revert "Use rails help new instead of rails new -h"
This reverts commit 6ac65c9202.
2011-11-13 21:57:39 +05:30
Vijay Dev e1099eb4fd Revert "Update guide to use Ruby 1.9 hash syntax"
This reverts commit 50a9de514f.

Reason: Let's keep the guides at 1.8 syntax
2011-11-13 21:50:18 +05:30
José Valim 2591cc6692 Merge pull request #3617 from indirect/remote_ip
refactor RemoteIp middleware
2011-11-13 04:53:51 -08:00
Jason Noble 50a9de514f Update guide to use Ruby 1.9 hash syntax 2011-11-13 03:15:56 -07:00
Jason Noble a3156ac0f2 Add output for add_index command 2011-11-13 03:15:22 -07:00
Jason Noble 0774f22941 Convert tables to table format 2011-11-13 03:13:58 -07:00
Jason Noble c0ee497436 Grammar change 2011-11-13 03:12:13 -07:00
Noé Froidevaux bf6efa8d9c Fix pull request #3609 2011-11-13 11:03:22 +01:00
Jason Noble 5e83491e97 Be explicit on where the show.html.erb is located 2011-11-13 01:40:28 -07:00
Jason Noble 3e3872b598 Make the guide more friendly
- Changed Rails 3.0 to 3.0+
2011-11-13 01:35:08 -07:00
Jason Noble 9b96f7414e Be explicit about changing code 2011-11-13 01:33:29 -07:00
Jason Noble cb552f807e p.errors.full_messages is a little more human readable 2011-11-13 01:32:26 -07:00
Jason Noble fc8f0a85b5 Add link to AR Validations and Callbacks to further explain validations 2011-11-13 01:31:33 -07:00
Jason Noble 1394c5447a Update wording to read better 2011-11-13 01:31:07 -07:00
Jason Noble 06a8d16c8e Update wording to be more explicit on what the timestamp fields track 2011-11-13 01:29:11 -07:00
Jason Noble 094bb8e50c Update order so they show up in the order they do in the scaffolding output 2011-11-13 01:28:09 -07:00
Jason Noble 434fbe454c Update wording to flow better 2011-11-13 01:27:14 -07:00
Jason Noble 703d5c2033 Fix typo 2011-11-13 01:26:23 -07:00
Jason Noble 4bf057b866 Move Tip up higher so users who are fine with SQLite can skip to the next section 2011-11-13 01:25:45 -07:00
Jason Noble 194a42e7aa Updated wording to read better 2011-11-13 01:24:44 -07:00
Jason Noble b778a7eefb Updated wording on what 'rails new blog' did for the user
- Alphabetized the files/folders created
- Added link to Configuring Rails Applications
2011-11-13 01:21:40 -07:00
Jason Noble 6ac65c9202 Use rails help new instead of rails new -h 2011-11-13 01:19:21 -07:00
Jason Noble ee100128c3 Move paragraphs to flow better
- Give the user a way to know they are fully installed and ready to continue
2011-11-13 01:19:01 -07:00
Jason Noble 962c55de0d Add Tip about skipping to Section 3 if they want to come back to the philosophy later 2011-11-13 01:16:58 -07:00
Cheah Chu Yeow f323b425f2 Fix bad English. 2011-11-13 13:35:32 +08:00
Cheah Chu Yeow d9703fe92e Clearing cache in action caching is not "the exact same way" as with page caching. 2011-11-13 13:34:16 +08:00
Cheah Chu Yeow 650ec898e5 Suggest a workaround for page caching and parameters instead of an unhelpful warning. 2011-11-13 13:25:39 +08:00
Cheah Chu Yeow a02b40a3d2 Fix "in memory" where it should be "in-memory". 2011-11-13 13:18:55 +08:00
Santiago Pastorino df300a754b Allow to use ruby-debug in 1.9.3 2011-11-12 15:16:53 -02:00
Jon Leighton 8f20d59e6e Merge pull request #3618 from amatsuda/ad_headers_unmemoizable
Unneeded require 'active_support/memoizable'
2011-11-12 06:49:47 -08:00
Akira Matsuda b74aedff3c Unneeded require memoizable 2011-11-12 23:15:54 +09:00
Andre Arko 317f4e2236 defer calculating the remote IP until requested 2011-11-12 00:45:31 -10:00
Andre Arko 9432163c60 refactor RemoteIp middleware
- return the last forwarded IP before REMOTE_ADDR to handle proxies
- remove completely superfluous RemoteIpGetter class
- remove duplication of trusted proxies regexp
- remove unused constant from Request
- move comments from Request to where they are actually relevant
- edit comments for clarity of purpose

The original code (confusingly) tried to return REMOTE_ADDR both at the beginning and the end of the chain of options. Since REMOTE_ADDR is _always_ set, this is kind of silly. This change leaves REMOTE_ADDR as the last option, so that proxied requests will be assigned the correct remote IP address.
2011-11-11 21:25:08 -10:00