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
24,998 Commits 34 Branches 105 Tags
1db58367546ef9e5ce03e34ca90ea535dabb674e
Commit Graph

24998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guillermo Iguaran
1db5836754 Refactor assets tests to use add_to_config instead of creating initializers with config values 2011-09-06 23:00:36 -05:00
Aaron Patterson
4edf6ea0ea Merge pull request #2897 from rsutphin/ar31-remove_connection 
Patch for issue #2820
 2011-09-06 17:43:58 -07:00
Aaron Patterson
f6ced69a11 Eliminate newlines in basic auth. fixes #2882 2011-09-06 17:25:20 -07:00
Aaron Patterson
54b7e783ef Database adapters use a statement pool. 
Database adapters use a statement pool for limiting the number of open
prepared statments on the database.  The limit defaults to 1000, but can
be adjusted in your database config by changing 'statement_limit'.
 2011-09-06 16:47:34 -07:00
Aaron Patterson
a4fa6eab39 adding a statement pool for mysql and sqlite3 2011-09-06 16:06:27 -07:00
Aaron Patterson
51652a4773 Merge pull request #2893 from dmathieu/errors_has_key 
add has_key? to ActiveModel::Errors
 2011-09-06 09:41:06 -07:00
Damien Mathieu
e0335e2ccb add has_key? to ActiveModel::Errors 2011-09-06 18:36:18 +02:00
Santiago Pastorino
ef14a0ec86 Merge pull request #2577 from rails-noob/master 
Fix double slash at start of paths when mounting an engine at the root.
 2011-09-06 09:10:39 -07:00
Santiago Pastorino
1e61f2603c Merge pull request #2889 from guilleiguaran/perform-caching-assets 
config.action_controller.perform_caching isn't used anymore in asset pipeline
 2011-09-06 09:03:52 -07:00
Guillermo Iguaran
6fc518e2ec config.action_controller.perform_caching isn't used anymore in assets pipeline, instead we are using config.assets.digest now 2011-09-06 10:46:52 -05:00
Jon Leighton
9bde73ff72 Nested through associations: preloads from the default scope of a through model should not be included in the association scope. (We're already excluding includes.) Fixes #2834. 2011-09-06 16:34:32 +01:00
rails-noob
43fbb1e6b8 Fix bug #2579. 
Avoids double slash at start of paths when mounting an engine at the root.
 2011-09-06 15:26:19 +00:00
Jon Leighton
b24d668859 Ensure we are not comparing a string with a symbol in HasManyAssociation#inverse_updates_counter_cache?. Fixes #2755, where a counter cache could be decremented twice as far as it was supposed to be. 2011-09-06 15:58:07 +01:00
Jon Leighton
9f3e732e65 Make the logic easier to read 2011-09-06 12:59:11 +01:00
Jon Leighton
77ff1ce541 Disable active record marshalling tests on Ruby 1.8.7 on Travis CI, as they have been failing intermittently for a long while due to what appears to be a Ruby bug. If anyone has the skills/expertise/time to debug this, please speak to the Travis guys. 2011-09-06 11:45:08 +01:00
Jon Leighton
3c846c29d3 Merge pull request #2883 from dmathieu/fix_test 
#first doesn't take an order in this test
 2011-09-06 02:56:15 -07:00
Jon Leighton
1fdd95d084 Merge pull request #2851 from dasch/patch-6 
No need to use a begin block there
 2011-09-06 02:50:27 -07:00
Damien Mathieu
e8d5920b74 #first doesn't take an order in this test 2011-09-06 10:01:33 +02:00
Santiago Pastorino
bd17c762ae Bump uglifier up 2011-09-05 20:33:26 -03:00
Santiago Pastorino
c0f3df3a2d Merge pull request #2870 from arunagw/uglifier_bump 
Uglifier bump
 2011-09-05 16:09:19 -07:00
Santiago Pastorino
164382003c Merge pull request #2877 from dmathieu/fix_tests_pg_18 
Last orders the records by id
 2011-09-05 15:41:59 -07:00
Damien Mathieu
51da1e5c65 first and last orders the records by id 2011-09-06 00:30:40 +02:00
Aaron Patterson
6d93f70c58 Merge pull request #2716 from jbbarth/fix_invert_rename_index 
Fix bad options order in AR::Migration::CommandRecorder#invert_rename_index
 2011-09-05 14:17:55 -07:00
Georg Friedrich
2175012230 Don't find belongs_to target when the foreign_key is NULL. Fixes #2828 2011-09-05 13:49:29 -07:00
Santiago Pastorino
7f7e362c14 Merge pull request #2873 from guilleiguaran/remove-unused-config 
Remove unused config variable from test.rb template
 2011-09-05 07:09:13 -07:00
Santiago Pastorino
a23e3855c5 Merge pull request #2872 from sikachu/content_tag_html_safe 
Make sure that result from content_tag_for with collection is html_safe
 2011-09-05 07:08:39 -07:00
Guillermo Iguaran
e8cb06a386 Remove unused config variable from test.rb template 2011-09-05 08:59:37 -05:00
Santiago Pastorino
f4a690dae7 Merge pull request #2815 from avakhov/current-page-non-get-requests 
current_page? returns false for non-GET requests
 2011-09-05 06:13:14 -07:00
Santiago Pastorino
c255e0eed5 Merge pull request #2799 from tomstuart/3-1-stable 
Never return stored content from content_for when a block is given
 2011-09-05 10:11:43 -03:00
Prem Sichanugrist
ffe56f3b8c Make sure that result from content_tag_for with collection is html_safe 
Thank you @spastorino for catching the empty test in b84cee0, as I totally forgot that I still have to make it html_safe.
 2011-09-05 20:04:37 +07:00
Jon Leighton
e221108c14 Merge pull request #2789 from dmathieu/limit_first_last 
Use LIMIT SQL word in first - Closes #2783
 2011-09-05 05:41:46 -07:00
Damien Mathieu
5f5527c726 Use LIMIT sql word in last when it's possible 2011-09-05 14:37:37 +02:00
Damien Mathieu
451cdd62ce use LIMIT SQL word in first - Closes #2783 2011-09-05 13:09:52 +02:00
Arun Agrawal
5e35d62cf5 Uglifier bump 2011-09-05 15:07:45 +05:30
Vijay Dev
24ee573d6c add blanks between methods 2011-09-05 13:41:25 +05:30
Jon Leighton
499ad11700 Merge pull request #2868 from arunagw/batches_test_pg_master 
Sort here to make sure the order is ok.
 2011-09-05 00:23:10 -07:00
Arun Agrawal
76e94016a4 Sort here to make sure the order is ok. 2011-09-05 12:49:34 +05:30
José Valim
7e16394b92 Merge pull request #2713 from FLOChip/500-fixed 
remove misleading line on 500 error page. #2648
 2011-09-05 00:16:41 -07:00
Santiago Pastorino
4f8777333d Remove empty test 2011-09-05 00:43:51 -03:00
Santiago Pastorino
8bffd6c6ae Merge pull request #2863 from raybaxter/silence_unitialized_instance_variable_warnings 
Silence unitialized instance variable warnings
 2011-09-04 20:37:02 -07:00
Ray Baxter
fa0ebf4c98 Tests shouldn't produce warnings 2011-09-04 20:27:53 -07:00
Santiago Pastorino
1e13fac0cc Merge pull request #2861 from guilleiguaran/assets-fix-changelog 
Add entry about Asset behaviour fix to ActionPack ChangeLog
 2011-09-04 19:01:46 -07:00
Guillermo Iguaran
81d715742a Add entry about Asset behaviour fix to ActionPack ChangeLog 2011-09-04 20:35:40 -05:00
Santiago Pastorino
6521cf3316 Merge pull request #2860 from guilleiguaran/fix-assets-behavior 
Fix AssetNotPrecompiledError behavior
 2011-09-04 15:41:13 -07:00
Guillermo Iguaran
9bc0082f29 AssetNotPrecompiledError should be raise when config.assets.digest = false, config.assets.compile = false and manifest file isn't present 2011-09-04 17:24:01 -05:00
Santiago Pastorino
a1fa756e17 * is not allowed in windows file names. Closes #2574 #2847 2011-09-04 17:44:48 -03:00
Jon Leighton
6c46506067 Merge pull request #2855 from arunagw/fix_find_in_batches_master 
We need to recorder here. Need to drop the order from default scope.
 2011-09-04 13:39:28 -07:00
Arun Agrawal
9066e34025 We need to recorder here. Need to drop the order from default scope. 
Fixes #2832
 2011-09-05 00:12:57 +05:30
Jon Leighton
e865d12543 Merge pull request #2852 from milandobrota/remove_unneeded_explicit_nil_checks 
if ... nil? is more expensive than unless
 2011-09-04 09:05:45 -07:00
Daniel Schierbeck
a76fbee9c9 No need to use a begin block there 2011-09-04 18:48:50 +03:00