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
16,665 Commits 34 Branches 105 Tags
a4eaa1fd39f93eff975bfd8a5cc4c7dfc3f18aa7
Commit Graph

16665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ernie Miller
a4eaa1fd39 Fix multiple self-referencing eager loads failing to join multiple times 
[#4679 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-06-08 01:02:19 -04:00
Mikel Lindsaar
e404490f9b Merge branch 'master' of git://github.com/rails/rails 2010-06-08 00:10:11 -04:00
wycats
8d576b51a1 Move the undef into the 1.9 only branch 2010-06-07 23:32:20 -04:00
Mikel Lindsaar
80a044edb6 Updating ActionMailer basics guide to have inline attachments 2010-06-07 23:25:49 -04:00
Mikel Lindsaar
3762362eab Updating readme for ActionMailer::Base 2010-06-07 23:14:54 -04:00
wycats
b97a3f33a3 Merge remote branch 'rsim/oracle_enhanced_rails3' 2010-06-07 23:03:59 -04:00
wycats
0042f4166f If we undef <=>, it solves a problem involving comparison. Please figure out the root cause. 2010-06-07 22:31:42 -04:00
Mikel Lindsaar
311d99eef0 Adding inline attachment support to ActionMailer 2010-06-07 21:54:53 -04:00
Mikel Lindsaar
21cc1ed437 Updating image_tag to support cid:content_id "URLs" 2010-06-07 21:53:31 -04:00
Santiago Pastorino
94ed39d146 This test shouldn't rely on the order of the data returned by select 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-06-07 20:06:31 -04:00
Diego Carrion
67a60ee314 Add shallow routes to the new router [Closes #3765] 2010-06-07 18:09:20 -05:00
José Valim
a04060fb6f Really make include_root_in_json default to true [#3770 state:resolved] 2010-06-08 01:02:45 +02:00
Mikel Lindsaar
a16fd96131 Merge branch 'master' of git://github.com/rails/rails 2010-06-07 18:30:18 -04:00
wycats
d6953cbfd3 regular expressions are usually ASCII-encoded, so force_encoding the content of a Node to the encoding of the regular expression is wrong. 2010-06-07 18:06:08 -04:00
José Valim
a210aff210 Add delete to middleware stack proxy. 2010-06-07 23:17:23 +02:00
José Valim
981f81275b Fix case when rendering a partial inside RJS with inherited layout [#4786 state:resolved] 2010-06-07 22:22:54 +02:00
Mikel Lindsaar
50031bf932 Updating ActionMailer to Mail 2.2.2 (fixing two tests to suit) 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-07 21:36:56 +02:00
Santiago Pastorino
ab764ecbfe Makes text_helper methods sanitize the input if the input is not safe or :safe => true option is not provided 2010-06-07 15:31:21 -04:00
Santiago Pastorino
399b493cb4 content_tag_string shouldn't escape_html if escape param is false 2010-06-07 15:31:11 -04:00
Mikel Lindsaar
735027e58d Updating ActionMailer to Mail 2.2.2 (fixing two tests to suit) 2010-06-07 15:30:08 -04:00
wycats
eebac02606 Make named helpers unprotected without becoming actions [#4696 state:resolved] 2010-06-07 15:29:55 -04:00
Rizwan Reza
3adb395da4 Fixed Load Error failures in 1.9.2-head 2010-06-07 14:53:37 -04:00
Santiago Pastorino
ed16ec6344 bump sqlite version to 1.3.0 
Signed-off-by: Xavier Noria <fxn@hashref.com>
 2010-06-07 16:10:55 +02:00
Xavier Noria
9e065c6bc1 Merge remote branch 'rails/master' 2010-06-07 15:44:57 +02:00
José Valim
1a8f784a23 member on resource should not expect an ID. 2010-06-07 11:20:54 +02:00
José Valim
634c9310e3 Make the logic for nested_records_changed_for_autosave? simpler. 
[#4648 state:resolved]
 2010-06-07 11:01:10 +02:00
Carlos Antonio da Silva
7eedc3f397 Fixing test class names and refactor line in autosave association 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-07 10:45:47 +02:00
Tom Meier
3f1cdb85b8 Require active support/string/conversions so constantize can be used in associations.rb 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-07 10:29:26 +02:00
José Valim
5273bd97e6 Make AP test suite green once again and speed up performance in layouts lookup for some cases. 2010-06-07 10:13:41 +02:00
Santiago Pastorino
b3d2080278 Observing module is using constantize 2010-06-06 22:42:28 -07:00
Xavier Noria
8c7730db02 oops, two cancelling errors made a previous test pass, fixing it 2010-06-07 07:27:51 +02:00
Xavier Noria
d96efe6368 the order in which we apply deltas in Date#advance matters, add test coverage for that 2010-06-07 06:59:09 +02:00
Rizwan Reza
ac9f8e1b7b Router accepts member routes on resource. [#4624 state:resolved] 2010-06-06 21:27:52 -04:00
Jeremy Kemper
83729e2fe3 Formats should always be an array. 2010-06-06 19:59:52 -04:00
Jeremy Kemper
9f93de9d3d Reset request.parameters after assigning params for functional tests 2010-06-06 12:07:40 -07:00
Xavier Noria
0dbc732995 AS guide: first complete draft covering date/calculations.rb 2010-06-06 18:26:42 +02:00
Jeremy Kemper
509f3d7d2f Simplify middleware stack lazy compares using named const references 2010-06-05 22:09:16 -07:00
Jeremy Kemper
9d0d6f7d26 Clear const references all at once 2010-06-05 22:08:02 -07:00
Jeremy Kemper
fd1a504136 ActiveSupport::Dependencies.constantize shortcut for caching named constant lookups 2010-06-05 22:05:58 -07:00
Jeremy Kemper
35ae42be4f Bump i18n to 0.4.1 2010-06-05 22:05:58 -07:00
Jeremy Kemper
7ace23abac Restore flash sweep 2010-06-05 22:05:57 -07:00
Jeremy Kemper
a5f3f3ef7a MySQL: require 2.7 or later so we can rely on result.each_hash 2010-06-05 14:59:51 -07:00
wycats
a6b3942843 Optimize LookupContext 2010-06-04 20:11:06 -07:00
wycats
16ee4b4d1b Small optimization of 1.9 unescape. We should make sure that inbound ASCII always means UTF-8. It seems so based on a quick survey of common browsers, but let's be sure 2010-06-04 20:11:06 -07:00
wycats
b8af484476 No need to unescape params twice if we came from Rack::Mount 2010-06-04 20:11:06 -07:00
wycats
ff4c218095 Memoizing methods on request means we need to clear them out on recycle! 2010-06-04 20:11:05 -07:00
wycats
cb1b2a719a Stop the flash middleware from forcibly loading sessions even if the user doesn't use sessions at all 2010-06-04 20:11:05 -07:00
wycats
a260e02fd3 Whoops. _run_*_callbacks is private 2010-06-04 20:11:05 -07:00
wycats
67a2d648d8 Improve performance of the Logger middleware by using simpler versions of methods 2010-06-04 20:11:05 -07:00
wycats
8b05c5207d Improve performance of MessageVerifier while keeping it constant time 2010-06-04 20:11:05 -07:00