mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
26,158 Commits 61 Branches 565 Tags 420 MiB
Commit Graph

26158 Commits

Author SHA1 Message Date
Aaron Patterson df5ec41b89 bundler treats trunk ruby as ruby 1.9, hack around that for now 2011-11-16 10:42:56 -08:00
Daniel Dyba 325abe9fba Substituted RailsCommands for Rails::Commands 2011-11-16 10:26:28 -08:00
Daniel Dyba 21c5a0a104 Changed Commands module to RailsCommands. 
This is to avoid a conflict that occurs when you add Rake to
your Gemfile. There is a Commands Object in Rake that conflicts
with the Commands module in plugin.rb. See rails issue #1866.
 2011-11-16 10:23:00 -08:00
Aaron Patterson 936404399d Merge pull request #3634 from RyanNaughton/fixes_3483 
Fixes 3483
 2011-11-16 09:26:02 -08:00
rpq bc00514b62 added comma 2011-11-15 23:20:21 -05:00
Jon Leighton 8d1a2b3ecd Revert "Merge pull request #3640 from indirect/remote_ip" 
This reverts commit 6491aadc52, reversing
changes made to 83bf0b626c.

See https://github.com/rails/rails/pull/3640#issuecomment-2752761 for
explanation.
 2011-11-15 22:47:18 +00:00
Yehuda Katz 6491aadc52 Merge pull request #3640 from indirect/remote_ip 
GetIp#to_s should never return nil. That's icky.
 2011-11-15 13:59:31 -08:00
Vijay Dev 83bf0b626c refactor test_multiple_of 2011-11-16 02:36:36 +05:30
Sergey Parizhskiy df08273d14 made url to a github issues a bit shorter - no need in a page param when it's a first page 2011-11-15 13:09:41 +02:00
Arun Agrawal 76b6027cd8 Unused variable removed 2011-11-15 13:23:27 +05:30
Ryan Naughton 63a22ca616 Fixes issue #3483, regarding using a mixture of ranges and discrete values in find conditions. Paired with Joey Schoblaska. 2011-11-14 21:43:27 -06:00
Gabriel Sobrinho e1b79c56be Failing test case for issue #3483 2011-11-14 21:39:03 -06:00
Andre Arko d743954792 GetIp#to_s should never return nil. That's icky. 2011-11-14 16:43:21 -10:00
Jon Leighton c7ab43ff06 Merge pull request #3632 from indirect/b8c85de 
unit test for fix from a few minutes ago
 2011-11-14 15:06:41 -08:00
Andre Arko b8c85de620 add test for bug fixed in 4f2bf64 2011-11-14 12:29:51 -10:00
José Valim 25c9e44a21 Merge pull request #3631 from indirect/remote_ip 
Force calculation of remote IP before using || operator
 2011-11-14 13:27:36 -08:00
Andre Arko 4f2bf6491c Return the calculated remote_ip or ip 
This was an especially nasty bug introduced in 317f4e2, by the way that an instance of GetIp is not nil, but GetIp#to_s could sometimes return nil. Gross, huh?
 2011-11-14 11:23:33 -10:00
Andre Arko cda1a5d5fe memoize the relatively expensive remote IP code 2011-11-14 11:20:57 -10:00
Andre Arko 00a0a4ddeb cleaner names 2011-11-14 11:20:20 -10:00
José Valim 9fa329b754 Speed up attribute invocation by checking if both name and calls are compilable. 2011-11-14 20:12:17 +01:00
José Valim 2088f1b3b4 Merge pull request #3626 from guilleiguaran/include-therubyrhino-gemfile 
Added therubyrhino to default Gemfile under JRuby
 2011-11-14 09:53:57 -08:00
Yehuda Katz 1df22bbb0f Merge pull request #3628 from oscardelben/refactoring 
use any? instead of !empty?
 2011-11-14 09:52:12 -08:00
Jon Leighton be777b30d5 Add a note to REALEASING_RAILS about testing the gem locally before releasing 2011-11-14 17:08:24 +00:00
Jon Leighton 156784fef1 rake release should push the tag 2011-11-14 16:55:31 +00:00
Oscar Del Ben af64ac4e5c use any? instead of !empty? 2011-11-14 16:56:05 +01: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
Guillermo Iguaran 49cd6a0ff7 Added therubyrhino to default Gemfile under JRuby 2011-11-14 07:07:38 -05: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
Jason Noble 8971cca7d0 Move tooltip on re-running rails new with a different --database option 2011-11-13 10:20:03 -07: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