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
27,353 Commits 34 Branches 105 Tags
ebfa58abc895c0639211cb896a47b04e424322c8
Commit Graph

27353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedikt Deicke
ebfa58abc8 Removes unneeded caching from ActiveRecord::Base.relation 2012-04-19 10:07:28 +02:00
Benedikt Deicke
2c21a2f7eb Revert "Revert "Fix #5667. Preloading should ignore scoping."" 
This reverts commit 1166d49f62.

Conflicts:

	activerecord/test/cases/associations/eager_test.rb
 2012-04-19 10:04:24 +02:00
Benedikt Deicke
8491740ca5 Adds test to check that circular preloading does not modify Model.unscoped (as described in #5667) 
Conflicts:

	activerecord/test/cases/associations/eager_test.rb
 2012-04-19 10:01:32 +02:00
Benedikt Deicke
13f1401a6c Removes caching from ActiveRecord::Core::ClassMethods#relation 
The #relation method gets called in four places and the return value was instantly cloned in three of them. The only place that did not clone was ActiveRecord::Scoping::Default::ClassMethods#unscoped. This introduced a bug described in #5667 and should really clone the relation, too. This means all four places would clone the relation, so it doesn't make a lot of sense caching it in the first place.

The four places with calls to relations are:

activerecord/lib/active_record/scoping/default.rb:110:in `block in build_default_scope'"
activerecord/lib/active_record/scoping/default.rb:42:in `unscoped'"
activerecord/lib/active_record/scoping/named.rb:38:in `scoped'"
activerecord/lib/active_record/scoping/named.rb:52:in `scope_attributes'"

Conflicts:

	activerecord/lib/active_record/core.rb
 2012-04-19 10:00:58 +02:00
Jeremy Kemper
1166d49f62 Revert "Fix #5667. Preloading should ignore scoping." 
Causes a subtle regression where record.reload includes the default
scope. Hard to reproduce in isolation. Seems like the relation is
getting infected by some previous usage.

This reverts commit dffbb521a0.
 2012-04-18 19:27:04 -07:00
Santiago Pastorino
39861395ff Add hook for add_resource_route 2012-04-18 17:59:03 -03:00
Aaron Patterson
476fa7aca2 Merge pull request #5894 from norman/3-2-fix-nil-logger 
Fix nil logger on 3.2
 2012-04-18 11:33:50 -07:00
Norman Clarke
d92166cb26 Check for nil logger 2012-04-18 14:44:32 -03:00
Jeremy Kemper
89f99e8112 Merge pull request #5874 from asanghi/3-2-stable 
replace ruby-debug19 with debugger on Rails 3-2 stable
 2012-04-17 07:41:16 -07:00
Aditya Sanghi
56674dbfc1 Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a more maintained debugger gem 2012-04-17 15:00:33 +05:30
Jeremy Kemper
9a97699460 Merge pull request #5861 from arunagw/multi_json_fix_3-2-stable 
Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3
 2012-04-16 07:47:36 -07:00
Arun Agrawal
9b14e3ff80 multi_json is restricted to < 1.3 
Some API changes are there above 1.3. 
3-2-stable
 2012-04-16 20:15:15 +05:30
Piotr Sarnacki
a748eca6cf Add missing require in Active Support time zones (fixes #5854) 
I also removed the other require as it's already present in
`activesupport/core_ext/time/calculations`
 2012-04-15 23:45:59 +02:00
ask
2f9fdbfb94 "rails new -h" shows message in rails directory 2012-04-13 16:05:25 +02:00
Vijay Dev
efa9a1ff8b fix typo in readme [ci skip] 2012-04-12 21:49:32 +05:30
Prem Sichanugrist
c0e6a85a56 Fix code example in generator test case 2012-04-12 21:48:22 +05:30
Jeremy Kemper
e473e1f213 Merge pull request #5820 from arunagw/more_ruby-2-0-fixes 
Update test for Ruby 2 compatibility
 2012-04-12 05:57:52 -07:00
Aaron Patterson
96d81e5df4 test against ruby features in order to fix tests on Ruby 2.0 2012-04-12 17:12:52 +05:30
Jeremy Kemper
e0fd4fc9e2 Merge pull request #5800 from arunagw/bigdecimal_dup 
Backport BigDecimal#duplicable? feature check from master
 2012-04-10 08:41:05 -07:00
Aaron Patterson
fedd87cc05 probably should require the objects we monkey patch. 2012-04-10 21:08:53 +05:30
Aaron Patterson
2991370a40 bigdecimal can be duped on Ruby 2.0 
Conflicts:

	activesupport/test/core_ext/duplicable_test.rb
 2012-04-10 21:06:17 +05:30
Aaron Patterson
ca0c0a20ac add the class name to the assertion message 2012-04-10 21:05:47 +05:30
Vijay Dev
a85ffd0fc0 Merge pull request #5799 from arunagw/readme_fix 
Readme fix
 2012-04-10 00:55:05 -07:00
Arun Agrawal
b1c28d7105 README fix! [skip ci] 2012-04-10 13:07:23 +05:30
Xavier Noria
dab76b11f5 Merge pull request #5725 from kevmoo/remove_unused_castcode 
Remove unused castcode
 2012-04-09 10:05:32 -07:00
Xavier Noria
b125db84a4 rewords the section about default_url_options in the Action Controller Overview guide 2012-04-09 18:26:47 +02:00
Santiago Pastorino
e7671b5b7f Merge pull request #5784 from rafaelfranca/default_url-3-2 
[3-2-stable] Document that default_url_options must return a hash with symbolized keys
 2012-04-08 20:58:09 -07:00
Rafael Mendonça França
6f4f499845 Document that default_url_options must return a hash with symbolized 
keys
 2012-04-09 00:02:59 -03:00
Rafael Mendonça França
5c7bcfc111 default_url_options does not receive one argument anymore 2012-04-08 23:54:36 -03:00
Anil Wadghule
05d4ccffce Fix 'Everyday Git' link 2012-04-07 22:14:04 +05:30
Vijay Dev
bfd5c84085 Merge pull request #5765 from anildigital/3-2-stable 
Update getting started guide to change Rails version to Rails 3.2
 2012-04-06 11:31:52 -07:00
Anil Wadghule
1cd939a323 Fix Rails version in getting started guide. 2012-04-06 23:40:05 +05:30
Santiago Pastorino
56d9945e8a Merge pull request #5737 from rafaelfranca/3-2-stable 
Fix tests of benchmark with silence equals to true
 2012-04-04 12:16:07 -07:00
Rafael Mendonça França
1124ac00c9 Fix tests of benchmark with silence equals to true 2012-04-04 16:14:13 -03:00
Santiago Pastorino
6663dd0969 Merge pull request #5188 from jlxw/patch-1 
logger.silence is deprecated
 2012-04-04 14:40:44 -03:00
Aaron Patterson
c4d31028f1 Merge pull request #5727 from hone/ar_database_url_logging 
ActiveRecord configuration logging
 2012-04-03 20:12:30 -07:00
Terence Lee
d46ad3460a log which config format AR uses to connect with 2012-04-03 21:59:24 -05:00
Terence Lee
93f25ac6fc test initializer logic for DATABASE_URL env var 2012-04-03 21:50:18 -05:00
Kevin Moore
6f19262719 Remove unused 'cast_code' variable 2012-04-03 17:39:53 -07:00
Tim Pope
8e315b0e0a DATABASE_URL allows omission of database.yml 2012-04-03 15:57:18 -07:00
Piotr Sarnacki
515e1d33f2 Usage file in generators shouldn't be fetched only based on source_root 
In case `source_roout` is not set, `default_source_root` is used,
which includes also `templates` directory. If there is no `templates`
directory, `default_source_root` is not available and USAGE will not
be displayed. USAGE should be also checked based on default
directory excluding `templates`.
 2012-04-02 00:30:42 +02:00
Rafael Mendonça França
27fc6ec95e Fix the redirect when it receive blocks with arity of 1. 
Closes #5677
 2012-03-31 17:59:21 +02:00
Aaron Patterson
9894d16653 Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find_select 
Fixing Identity Map when using find select in rails 3.2
 2012-03-30 16:45:24 -07:00
Santiago Pastorino
69465d9f7c Merge branch '3-2-3' into 3-2-stable 2012-03-30 19:34:33 -03:00
Santiago Pastorino
45d6cd94b3 Bump up to 3.2.3 2012-03-30 19:22:28 -03:00
Jon Leighton
dffbb521a0 Fix #5667. Preloading should ignore scoping. 
Conflicts:

	activerecord/test/cases/associations/eager_test.rb
 2012-03-30 16:24:41 +01:00
Santiago Pastorino
5c7bb86a1b Remove the leading \n added by textarea on assert_select 2012-03-30 11:45:12 -03:00
Santiago Pastorino
13fe1903d8 Remove the leading \n added by textarea on assert_select 2012-03-30 11:44:15 -03:00
Arturo Pie
6896cd4515 refactor instantiate method in base, so we remove nesting if's which make the code harder to read. Minor changes to contain_all_columns in IdentityMap. 
Conflicts:

	activerecord/lib/active_record/base.rb
 2012-03-29 22:39:01 -04:00
Arturo Pie
714a2c810d refactor the checking of the attributes of the record in IdentityMap#add, so it's more readable 2012-03-29 22:24:15 -04:00