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
23,269 Commits 34 Branches 105 Tags
9370855d54cb00a0e740949104d3add55f17656a
Commit Graph

23269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
José Valim
9370855d54 Move config.default_asset_host_protocol to the railtie. 2011-07-07 19:16:36 -03:00
Santiago Pastorino
d7be017c7e Merge pull request #2002 from knapo/3-1-stable 
Backport of #1997
 2011-07-07 09:30:16 -07:00
Santiago Pastorino
0b62aa021f Merge pull request #2001 from tobsch/3-1-stable 
Now accepting css/js files in deeper directory structures by default.
 2011-07-07 09:23:13 -07:00
knapo
7c051ab075 Make ActiveRecord::Batches#find_each to not return self. 
This caused that `find_each` was producing extra db call taking all the records from db, and was less efficient than `ActiveRecord::Base#all`.
 2011-07-07 18:13:29 +02:00
Tobias Schlottke
564139620c Now accepting css/js files in deeper directory structures by default. 
This is useful for engines with own application.{js|css}-files.
See: https://github.com/rails/rails/issues/1520
 2011-07-07 17:56:48 +02:00
Dmitriy Kiriyenko
fd8dbfa776 Add require ActiveSupport delegation to ActiveRecord::Relation class. 2011-07-07 17:09:03 +02:00
Santiago Pastorino
ec27814883 Merge pull request #1990 from simonbaird/3-1-stable 
rake db:test:purge creates mysql database with wrong charset & collation (3-1-stable)
 2011-07-06 20:10:17 -07:00
José Valim
8d0f03923c Give higher priority to assets.cache_store. 2011-07-06 18:00:39 -07:00
José Valim
d8e2a1fd8a Make compressors lazily load. 2011-07-06 21:45:36 -03:00
Jon Leighton
fe2167f3f1 Don't construct association scope in initializer. This yields a big performance gain for cases where the association is never used to load the target, for example with preloading. Related: #1873. 2011-07-07 01:08:06 +01:00
Simon Baird
f44c3ea457 Fix charset/collate in mysql recreate_database 
See new method mysql_creation_options. It is used by both
create_database and recreate_database so they are consistent.

(Manual cherry pick of 3ba3125b24)
 2011-07-07 09:43:16 +10:00
José Valim
a05d59fe06 Deprecate stream at the class level. 
This is because only template rendering works with streaming.
Setting it at the class level was also changing the behavior
of JSON and XML responses, closes #1337.
 2011-07-06 20:33:01 -03:00
Santiago Pastorino
3a92bc7906 Merge pull request #1789 from grantneufeld/schema_column_exists_options_hash_3_1 
Fix default options argument on ActiveRecord::ConnectionAdaptors::Table#column_exists?
 2011-07-06 12:00:35 -07:00
Santiago Pastorino
e7ac539c62 Merge pull request #1904 from oriolgual/1571_fix_for_3_1_stable 
Fix #1571 for 3-1-stable
 2011-07-06 11:57:36 -07:00
Oriol Gual
7c6a8406f4 Fix reverse order with new Arel Nodes (#1571) 2011-07-06 20:50:56 +02:00
Santiago Pastorino
d5bc701e87 Merge pull request #1982 from spohlenz/backport-1778 
Backport of #1778 (fix nested fields_for when Hash-based model is passed)
 2011-07-06 11:36:05 -07:00
Santiago Pastorino
01d881cb3e Merge pull request #1895 from arunagw/fix_test_for_jruby_db-3-1-stable 
Fix test for jruby db 3 1 stable
 2011-07-06 11:15:55 -07:00
Xavier Noria
afe8eb56ec Merge pull request #1983 from vijaydev/cherrypicks-validator-gem 
Cherrypick for 3-1-stable - adding w3c_validators gem
 2011-07-06 05:37:19 -07:00
Vijay Dev
53903f4265 add w3c_validators gem to the doc group to fix failing validation of guides 2011-07-06 17:50:54 +05:30
Sam Pohlenz
7f3e45c2ec Test for extractable_options? within nested fields_for. 
This fixes an error when a record object that is a subclass of Hash is
passed to fields_for, which is incorrectly interpreted as field options.
 2011-07-06 21:25:07 +09:30
Xavier Noria
07ea84a03b syncs guides with master 2011-07-05 01:49:25 +02:00
Dieter Komendera
5a7c8e27eb Only call set_owner_attributes for has_one association if target exists. 2011-07-05 00:15:43 +01:00
Andrew White
5bb37ab867 Revert "The rails gem doesn't have a lib directory." 
RubyGems requires at least one require_path.

This reverts commit 92c852f7e2.
 2011-07-04 16:57:36 +01:00
Andrew White
92c852f7e2 The rails gem doesn't have a lib directory. 2011-07-04 14:54:29 +01:00
Andrew White
cee27beb0c Use an instance variable to store the current masss assignment options 
(cherry picked from commit 9f7442a3ab)
 2011-07-04 06:49:15 +01:00
Vijay Dev
d764378489 Reversing the changes done in c278a2c while still resolving #1857. 
The changes broke bulk migration tests and were fixed in 4d256bc6;
however that brought back the issue of #1857 and so this commit goes
back to the original scenario and just adds change_table to the list
of methods which are to be recorded in the CommandRecorder. The
method_missing now delegates all calls to the underlying connection as
before.
 2011-07-03 17:28:03 +01:00
José Valim
9ed063244a Merge pull request #1949 from dmathieu/cherry-picks 
Cherry picks for 3-1-stable
 2011-07-03 07:17:18 -07:00
Damien Mathieu
a96d77aac4 all numerics should be html_safe - Closes #1935 2011-07-03 16:12:51 +02:00
Prem Sichanugrist
01c1a86566 Fix failing test on uninitialized Rails.config.assets.prefix 
This was introduced in [2684f17a17] 💣
 2011-07-03 15:58:33 +02:00
José Valim
91718c866b Merge pull request #1947 from spohlenz/refactor-asset-paths-3-1 
Refactor sprockets asset paths to allow for alternate asset environments
 2011-07-02 21:15:09 -07:00
Sam Pohlenz
b494b5cf9d Add documentation for asset_prefix and asset_environment 
(cherry picked from commit 21344bc33b)
 2011-07-03 13:40:30 +09:30
Sam Pohlenz
add63ee220 Add tests for alternate asset prefix/environment 
(cherry picked from commit 0613f3bcdb)
 2011-07-03 13:40:19 +09:30
Sam Pohlenz
b8fa5f65a6 Refactor sprockets asset paths to allow for alternate asset environments 2011-07-03 13:40:01 +09:30
José Valim
108210cffe Merge pull request #1946 from spohlenz/fix-engine-migrations-check-3-1 
Fix engine migrations check
 2011-07-02 21:08:41 -07:00
Sam Pohlenz
55d93f3221 Fix has_migrations? check in Rails::Engine 
(cherry picked from commit a7a58af244)
 2011-07-03 13:32:54 +09:30
Santiago Pastorino
986e193b8c Merge pull request #1942 from dmathieu/url_for 
Cherry Pick for 1940
 2011-07-02 18:17:56 -07:00
Damien Mathieu
827e8a5983 provide a more explicit message when using url_for with nil 
This fixes the problem of having a non-explicit message when the :location option is not provided in respond_with.
 2011-07-03 02:13:53 +02:00
Aaron Patterson
896638238b a few minor performance improvements: fewer strings, fewer range objects, fewer method calls 2011-07-01 15:20:28 -07:00
José Valim
b6315d597b require 'thread' before using Mutex 2011-07-01 14:52:28 -07:00
Aaron Patterson
37eef89a2b calling super is super. if the other object is exactly equal, we can return early 2011-07-01 14:39:13 -07:00
Aaron Patterson
d5de496b87 remove unused codes 2011-07-01 14:39:10 -07:00
Andrew White
7467df72a8 It's autoload all the way down 
(cherry picked from commit 2d16515e52)
 2011-07-01 21:45:08 +01:00
Andrew White
a8410a2ca5 Don't require ActionView::Context as it's autoloaded 
(cherry picked from commit 79924c637d)
 2011-07-01 20:38:03 +01:00
Andrew White
0155e10a73 Revert "Add missing require for ActionView::AssetPaths" 
This reverts commit ad1d3db983.
 2011-07-01 20:37:37 +01:00
Andrew White
1e56adacee Add missing requires for ActionView::Context and Module#instance_method_names 
(cherry picked from commit fdaecbed84)
 2011-07-01 20:20:16 +01:00
Andrew White
ad1d3db983 Add missing require for ActionView::AssetPaths 
(cherry picked from commit 987eb7d423)
 2011-07-01 20:19:53 +01:00
Ernie Miller
280b657e60 Require attr_internal before using in ActionView::Helpers 
(cherry picked from commit 3a2ef52ad6)

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
 2011-07-01 20:19:06 +01:00
Aaron Patterson
2d459d25dc reduce calls to owners_by_key and to read_attribute, respond_to? etc 2011-07-01 09:56:00 -07:00
Bogdan Gusiev
337a446ab2 Fixed ActionView::FormOptionsHelper#select with :multiple => false 
(cherry picked from commit 0fdac01876)

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
 2011-07-01 13:00:55 +01:00
Jon Leighton
92c68dabd5 Add an extremely lulzy deprecation warning which tries to detect if AssociationReflection#build_association has been overridden, but ignores the block argument. 2011-06-30 23:39:43 +01:00