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,816 Commits 34 Branches 105 Tags
f1553731ed5b358ddc4465fa9de453fb992dbddf
Commit Graph

23816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Kiriyenko
f1553731ed Add require ActiveSupport delegation to ActiveRecord::Relation class. 2011-07-07 17:32:18 +03:00
José Valim
4b6232e5a7 Merge pull request #1996 from bogdan/default_sanitizer_squashed 
Rails app template: setup different mass assignment sanitizer for envs
 2011-07-07 03:59:34 -07:00
José Valim
03a016c08f Merge pull request #1406 from dmathieu/fix_test_warnings 
Fix test warnings
 2011-07-07 03:59:01 -07:00
dmathieu
e722fbb50f remove the warning when testing whiny_nil 2011-07-07 11:21:23 +02:00
Bogdan Gusiev
0fab8c388e Rails app template: setup different mass assignment sanitizer for envs 
For production - leave the default
For test and dev: :strict.
 2011-07-07 10:24:05 +03:00
Santiago Pastorino
1bad08f116 Merge pull request #1120 from lysenko/collection_singular_ids 
collection_singular_ids ignores association :include option
 2011-07-06 20:13:24 -07:00
Santiago Pastorino
c6578d64ca Merge pull request #1989 from simonbaird/master 
rake db:test:purge creates mysql database with wrong charset & collation (master branch)
 2011-07-06 20:10:14 -07:00
José Valim
35597e3606 Ensure the engine_path is there (it may make CI happy). 2011-07-06 23:00:02 -03:00
José Valim
86e2f888e7 Give higher priority to assets.cache_store. 2011-07-06 17:59:56 -07:00
José Valim
2f6e3895a8 Make compressors lazily load. 2011-07-06 21:41:13 -03:00
Jon Leighton
86390c3bf3 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:07:31 +01:00
Simon Baird
ecd37084b2 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.

(Cherry pick of 3ba3125b24)
 2011-07-07 09:27:51 +10:00
José Valim
7da88c5b29 Remove 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:24:30 -03:00
Jon Leighton
689c3d674c Merge pull request #1987 from ernie/fix_fix_to_reverse_sql_order 
Remove case statement changes from 2e0840d and 56ac32a. Inheritance FTW.
 2011-07-06 14:33:14 -07:00
Anatoliy Lysenko
66dd2d3d10 Fix bug in collection_singular_ids on has many through association with conditions and includes, 
when condtions references tables from includes.
Test fail because of invalid sql:
ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column: comments.id:
SELECT "posts".id FROM "posts" INNER JOIN "readers" ON "posts"."id" = "readers"."post_id"
WHERE "readers"."person_id" = 1 AND (comments.id is null)

Bug described in github#925

This commit will revert fix from 3436fdfc12 , but tests is ok.

Bug described in #6569 ticket.
 2011-07-06 23:23:34 +03:00
Ernie Miller
2bdad7669c Remove case statement changes from 2e0840d and 56ac32a. Inheritance FTW. 2011-07-06 16:13:57 -04:00
Santiago Pastorino
c713cf9a5d Merge pull request #1273 from jeremyf/feature-association-proxy-send 
Addresses an inconsistency in the ActiveRecord::Base.method_missing handl
 2011-07-06 13:05:58 -07:00
Santiago Pastorino
d10d93225c Merge pull request #1463 from psanford/master 
Fix timezone handling in String.to_time
 2011-07-06 12:36:47 -07:00
Santiago Pastorino
d5bd7030e5 Merge pull request #1494 from anildigital/master 
Fix failing test because of Timezone difference.
 2011-07-06 12:23:19 -07:00
Santiago Pastorino
61913684a2 Merge pull request #1926 from tobsch/master 
Accept application.js/.css to exist in a deeper directory depth by default
 2011-07-06 11:42:29 -07:00
Jon Leighton
2c72830cd9 Merge pull request #1979 from bogdan/association_sum_array_compatibility 
Fixed AR::Relation#sum compatibility with Array#sum
 2011-07-06 00:49:05 -07:00
Aaron Patterson
a990b1223b updating pg supported versions docco. fixes #1959 2011-07-05 11:32:31 -07:00
Santiago Pastorino
b27871a66f Merge pull request #1968 from bogdan/associations_find_array_compatibility2 
Fixed CollectionAssociation#find to be compatible with Array#find
 2011-07-05 09:41:09 -07:00
Bogdan Gusiev
e7bec4e435 Fixed AR::Relation#sum compatibility with Array#sum 
In order make Relation behavior closer to Array
Made Relation#sum to accept block and delegate it to Array#sum
 2011-07-05 14:36:20 +03:00
José Valim
eb2e109b7e Merge pull request #1963 from jake3030/fix_engine_rake_task 
Fix engine rake task
 2011-07-05 03:41:54 -07:00
Bogdan Gusiev
8ba0c1ac53 Fixed CollectionAssociation#find to be compatible with Array#find 
In order to make CollectionAssociation behave closer to Array
Add the ability to pass block to #find method just like Array#find does.
 2011-07-05 10:51:40 +03:00
Xavier Noria
289b5253ce Merge branch 'master' of git://github.com/lifo/docrails 2011-07-05 01:42:13 +02:00
Jon Leighton
892c99ca5c Merge pull request #1964 from kommen/has_one_fix 
Only call set_owner_attributes for has_one association if target exists. [3.1.0rc4]
 2011-07-04 16:14:56 -07:00
Jake Varghese
467c9b6e23 fix engines rake tasks 2011-07-04 15:48:15 -05:00
Vijay Dev
254a1e57d7 minor edit in 7896ac3 2011-07-05 00:10:59 +05:30
Dieter Komendera
7d3aa2462c Only call set_owner_attributes for has_one association if target exists. 2011-07-04 18:43:09 +02:00
Andrew White
718542bb18 Revert "The rails gem doesn't have a lib directory - closes #1958." 
RubyGems requires at least one require_path.

This reverts commit e7fc5d1cad.
 2011-07-04 16:59:51 +01:00
Andrew White
e7fc5d1cad The rails gem doesn't have a lib directory - closes #1958. 2011-07-04 14:52:29 +01:00
Xavier Noria
8c1bd05662 Merge pull request #1957 from vijaydev/add-validator-gem 
Add w3c_validators gem to the doc group to fix failing validation of guides
 2011-07-04 04:44:54 -07:00
Vijay Dev
8b25b55755 add w3c_validators gem to the doc group to fix failing validation of guides 2011-07-04 17:12:25 +05:30
Andrew White
9f7442a3ab Use an instance variable to store the current masss assignment options 2011-07-04 06:47:42 +01:00
José Valim
78ff00d196 Merge pull request #1950 from dmathieu/require_railties 
Add railties to the load path if it's not already there
 2011-07-03 15:45:39 -07:00
Damien Mathieu
dc2d8af1a3 Load the generators test helper and properly load it's test case 2011-07-03 20:22:30 +02:00
Jon Leighton
3adb24aa6b Merge pull request #1941 from vijaydev/command-recorder-fix 
Reversing the changes related to CommandRecorder
 2011-07-03 09:23:43 -07:00
Mohammad Typaldos
47139b8cb6 Edited railties/guides/source/asset_pipeline.textile via GitHub 2011-07-03 07:13:20 -07:00
Vijay Dev
caab9f4e95 document meta methods 2011-07-03 18:15:47 +05:30
José Valim
17693a99ef Merge pull request #1948 from dmathieu/html_safe_numeric 
All numerics should be html_safe
 2011-07-03 05:18:57 -07:00
Damien Mathieu
b7327241aa all numerics should be html_safe - Closes #1935 2011-07-03 13:09:46 +02:00
Richard Hulse
a715c37218 [asset pipeline] expand section on configuration 2011-07-03 17:20:04 +12:00
José Valim
a1d85a03bd Merge pull request #1945 from spohlenz/fix-engine-migrations-check 
Fix has_migrations? check in Rails::Engine
 2011-07-02 20:42:08 -07:00
Sam Pohlenz
a7a58af244 Fix has_migrations? check in Rails::Engine 2011-07-03 13:02:58 +09:30
José Valim
3875e449ab Merge pull request #1925 from spohlenz/refactor-asset-paths 
Refactor sprockets asset paths to allow for alternate asset environments
 2011-07-02 20:23:47 -07:00
Richard Hulse
c7dec1716e [asset pipeline] More updates 
resources for fingerprinting, grammar,CSS
 2011-07-03 14:11:41 +12:00
Richard Hulse
0dc2c57bb3 [asset pipeline] Add resources to fingerprinting 2011-07-03 13:53:39 +12:00
Sam Pohlenz
21344bc33b Add documentation for asset_prefix and asset_environment 2011-07-03 10:29:04 +09:30