github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-08 05:05:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,827 Commits 34 Branches 105 Tags
db22c89543f45d7f27847003af949afa21cb6fa1
Commit Graph

7827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew White
db22c89543 Merge scoped :joins together instead of overwriting them. May expose scoping bugs in your code! 
[#501 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-28 12:07:15 -07:00
Ernie Miller
44af2efa2c Refactored AssociationCollection#count for uniformity and Ruby 1.8.7 support. 
[#831 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-28 11:58:25 -07:00
Jeremy Kemper
ce4d13861d Merge branch 'master' of git@github.com:rails/rails 2008-08-28 11:47:06 -07:00
Joshua Peek
acbf2b74aa Deprecated implicit local assignments when rendering partials 2008-08-28 10:37:46 -05:00
Michael Koziarski
8b6870cfae Prevent deprecation warning in the tests 2008-08-28 12:47:18 +02:00
Bradford Folkens
293f99700d Reinstate Range#step default argument. 
[#595 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-27 23:48:54 -07:00
Tarmo Tänav
96c6fe0842 Implement count limit/offset support for has_many associations 
[#348 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-27 23:32:21 -07:00
Tarmo Tänav
13671cc565 Alias included associations if needed when doing a count 
[#302 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-27 23:29:29 -07:00
Tom Lea
ad562c58ea Dirty: treat two changes resulting in the original value as being unchanged. 
[#798 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-27 23:13:41 -07:00
Ken Collins
f277e1d8fd Added TextHelper#current_cycle to return the current cycle for better design options. 
[#417 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-27 23:06:20 -07:00
Michael S. Klishin
e42a235dd1 Request#remote_ip handles the uncommon case that REMOTE_ADDR is a comma-separated list. 
[#523 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-27 23:03:11 -07:00
Lars Kanis
c2068d14d2 PostgreSQL: fix quote_string for certain old pg drivers. [#94 state:resolved] 2008-08-27 22:51:10 -07:00
Jeremy Kemper
a444c78212 respond_to? passes along splat args to avoid introducing the second arg if it was omitted 2008-08-27 21:32:51 -07:00
Tim Haines
82778351a8 Add TestUploadFile.content_type= to match Request.UploadedFile 
[#920 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-27 18:50:29 -07:00
Jeremy Kemper
657898c821 Merge commit 'sven/i18n' 
Conflicts:
	activesupport/lib/active_support.rb
 2008-08-27 12:31:07 -07:00
Joshua Peek
87fafe4074 Moved Logger extensions into core_ext 2008-08-27 11:33:18 -05:00
Luca Guidi
ce65a05c5b Fix Ruby's Time marshaling bug in pre-1.9 versions of Ruby: utc instances are now correctly unmarshaled with a utc zone instead of the system local zone [#900 state:resolved] 2008-08-27 08:57:36 -05:00
Michael Koziarski
b7cd4ded93 Formally deprecate the old secret key generator 2008-08-27 15:18:07 +02:00
Hongli Lai (Phusion
b3411ff59e Deprecate Rails::SecretKeyGenerator in favor of ActiveSupport::SecureRandom. 
SecureRandom has a few minor security enhancements and can be used as a drop-in replacement

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#913 state:committed]
 2008-08-27 15:08:16 +02:00
Marko Seppae
cba83ede5d I18n: remove #populate from Simple backend as well 2008-08-27 12:00:14 +02:00
pivotal
9dbde4f5cb Fix two has_one :through errors 
* Set the association target on assignment;
* Reset target to nil on reset, rather than empty array.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#895 state:committed]
 2008-08-27 11:22:15 +02:00
Marko Seppae
2d03a4c668 i18n: fixed failing tests after removing #populate and #store_translations 2008-08-27 10:37:01 +02:00
Marko Seppae
0fcd5b5466 I18n: removed call to #populate from main library files 2008-08-27 10:36:00 +02:00
Marko Seppae
44de71ba94 I18n: removed #populate and #store_translations from api 2008-08-27 10:16:25 +02:00
Joshua Peek
6ec07e0737 Store application and other context specific helper modules in ActionView::Base#helpers 2008-08-26 16:17:58 -05:00
Joshua Peek
cd91a8d3ad defined? has no bounds 2008-08-26 15:21:06 -05:00
Joshua Peek
9853134b4f Require missing libraries and check for defined ActionController constant so ActionView can be used standalone 2008-08-26 15:13:28 -05:00
Joshua Peek
8756dd75b2 Performance: reduce garbage created by ActiveRecord::Calculations#column_alias_for 2008-08-26 14:24:52 -05:00
Joshua Peek
229eedfda8 Cache JavaScriptGenerator's helper module set on the template 2008-08-26 12:17:55 -05:00
Hongli Lai (Phusion
c111522d5b The 'rails' command was broken by the last commit. Fix that. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-08-26 16:28:41 +02:00
Hongli Lai (Phusion
f9f1ab4e3d When an unexpected exception is caught, tell the administrator to read the log file for more information about the error. This should make things less confusing for developers who are new to Rails. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-08-26 14:30:19 +02:00
Tarmo Tänav
eec5eb2e44 Fix yet another implicit order dependant test 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-08-26 13:16:55 +02:00
Tarmo Tänav
3dfecfe773 Print the queries that were executed if assert_queries fails 2008-08-26 12:45:04 +02:00
Michael Koziarski
bb557b44e9 Be more careful 2008-08-26 12:21:48 +02:00
Michael Koziarski
86bf279b89 Re enable CI for postgresql 2008-08-26 12:14:07 +02:00
Tarmo Tänav
ce3c76de7c Just look at sql_type when testing that the correct database-specific type was used 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-08-26 12:11:01 +02:00
Jeremy Kemper
e06878c22b Merge branch 'master' of git@github.com:rails/rails 2008-08-26 03:04:14 -07:00
Tarmo Tänav
00d2165f74 Back to fetching all versions in ruby instead of letting SQL do it as it's difficult to get all databases to convert the text value to a number with the same SQL 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-26 03:00:36 -07:00
Jeremy Kemper
ab1e82b8f7 Include people and readers fixtures to fix test isolation error 2008-08-26 02:38:48 -07:00
Jeremy Kemper
0c7bbc72fc fix tests relying on implicit ordering 2008-08-26 02:17:36 -07:00
Jeremy Kemper
b319e69ecb PostgreSQL: pg driver expects nil instead of empty string for missing user/pass 2008-08-26 01:54:14 -07:00
Jeremy Kemper
d2d739fd06 Merge branch 'master' of git@github.com:rails/rails 2008-08-26 01:50:32 -07:00
Tarmo Tänav
973c0ef26d Create mysql binary_fields table with latin1 character set as with utf8 all the limits would have to be divided by 3 to get the expected text types 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-26 01:49:19 -07:00
Jeremy Kemper
11612bf956 Merge branch 'master' of git@github.com:rails/rails 2008-08-26 00:55:25 -07:00
Tarmo Tänav
fa795ccfad Include mysql older than 5.1.23 in the 5.1 series in the list of those that can't handle NULL defaults 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-26 00:53:19 -07:00
Chad Woolley
289e3b9072 use double quotes 2008-08-26 09:40:19 +02:00
Jeremy Kemper
52e15abbed um.. yeah 2008-08-26 00:10:16 -07:00
Jeremy Kemper
6d66ddaa34 typo 2008-08-26 00:02:30 -07:00
Jeremy Kemper
842d55cb16 fix another ordering failure 2008-08-26 00:02:22 -07:00
Jeremy Kemper
ca48da6300 fix tests relying on implicit ordering 2008-08-25 23:53:31 -07:00