github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
25,980 Commits 34 Branches 105 Tags
63a22ca6169f06d10cd843ea3a75df6498fdcf7d
Commit Graph

25980 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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