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
25,293 Commits 34 Branches 105 Tags
89e98e278abe8564b80953855fcb4bcb9871c51c
Commit Graph

25293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Leighton
89e98e278a Merge pull request #3030 from htanata/fix_habtm_select_query_method 
Fix: habtm doesn't respect select query method
 2011-09-26 16:52:23 +01:00
Santiago Pastorino
d6cff93152 Just assert_equal here 2011-09-26 12:20:52 -03:00
Santiago Pastorino
2c3a5075b6 Merge pull request #3135 from christos/respect_assets_digest_value 
Give precedence to `config.digest = false` over the existence of manifest.yml asset digests
 2011-09-26 08:16:02 -07:00
Jon Leighton
3b87c38d02 Fix belongs_to polymorphic with custom primary key on target. 
Closes #3104.
 2011-09-26 15:42:34 +01:00
José Valim
5c0e9333c0 Encapsulate assets initialization in its own rake task. 2011-09-26 16:31:30 +02:00
Santiago Pastorino
b855327443 image_tag should use /assets if asset pipelining is turned on. Closes #3126 2011-09-26 11:20:30 -03:00
Christos Zisopoulos
793e9da63d Give precedence to config.digest = false over manifest.yml asset digests 2011-09-26 14:27:04 +02:00
Jon Leighton
a15424b92c Make serializable_hash take attr values directly from attributes hash. 
Previously, it would use send() to get the attribute. In Active
Resource, this would rely on hitting method missing. If a method with
the same name was defined further up the ancestor chain, that method
would wrongly be called.

This change fixes test_to_xml_with_private_method_name_as_attribute in
activeresource/test/cases/base_test.rb, which was broken after
51bef9d8fb, because that change made
to_xml use serializable_hash.
 2011-09-26 12:40:03 +01:00
Jon Leighton
b838059817 CollectionProxy#replace should change the DB records rather than just mutating the array. Fixes #3020. 2011-09-26 10:41:58 +01:00
Vijay Dev
541018a07b fix deprecation warning in cookie_store_test 
The options argument to MessageVerifier#initialize should be a hash.
 2011-09-25 23:21:37 +05:30
José Valim
6185929882 Merge pull request #3125 from dolzenko/master 
Implement Mime::Type#respond_to? (consistently with #method_missing) Closes #3032
 2011-09-25 05:26:18 -07:00
Evgeniy Dolzhenko
86cf3fb5fa Implement Mime::Type#respond_to? (consistently with #method_missing) 2011-09-25 13:03:01 +01:00
José Valim
933ba0cf6e Merge pull request #3124 from avakhov/patch-6-stylesheet-link 
escape options for the stylesheet_link_tag method
 2011-09-25 04:03:13 -07:00
José Valim
ef4d1cebbc Merge pull request #2246 from guilleiguaran/sprockets-compressors-api 
Public API for add new compressors to Sprockets
 2011-09-25 04:01:37 -07:00
Alexey Vakhov
5ffa69793f escape options for the stylesheet_link_tag method 2011-09-25 09:40:49 +04:00
Guillermo Iguaran
038808ba1a Add public API for register new js and css compressors for Sprockets 2011-09-24 19:22:13 -05:00
Santiago Pastorino
6eaa9f0dad Merge pull request #3123 from avakhov/patch-5-remove-superfluous-to-s 
remove superfluous to_s in ERB::Util.html_escape
 2011-09-24 14:22:44 -07:00
Santiago Pastorino
d54ff41f8e Merge pull request #3121 from cablegram/3-1-stable 
Re-launch assets:precompile task using (Rake.)ruby instead of Kernel.exec so it works on Windows
 2011-09-24 18:18:30 -03:00
Santiago Pastorino
3de95fd930 Revert "Make process reuse the env var passed as argument" 
This reverts commit 0e4748cd41.
 2011-09-24 17:19:42 -03:00
Alexey Vakhov
f916474962 remove superfluous to_s in ERB::Util.html_escape 2011-09-24 23:27:06 +04:00
José Valim
e69011521d Avoid using pathnames and automatically create the manifest directory if one does not exist yet. 2011-09-24 03:17:49 +02:00
José Valim
e9b02ae27a Add test for belongs_to? and group initializers. 2011-09-24 03:17:43 +02:00
José Valim
6795a9b309 Remove the ENV flag, yagni. 2011-09-24 03:17:37 +02:00
José Valim
eb367afeed rake assets:precompile loads the application but does not initialize it. 
To the app developer, this means configuration add in
config/initializers/* will not be executed.

Plugins developers need to special case their initializers that are
meant to be run in the assets group by adding :group => :assets.

Conflicts:

	railties/CHANGELOG
	railties/test/application/assets_test.rb
 2011-09-24 03:17:23 +02:00
Santiago Pastorino
096717e6f7 Merge pull request #3115 from guilleiguaran/refactor-rails-helpers 
Remove Sprockets compute_public_path, AV compute_plubic_path can be used
 2011-09-23 12:07:30 -07:00
Guillermo Iguaran
a29c2bfba3 Remove Sprockets compute_public_path, AV compute_public_path can be used directly 2011-09-23 14:00:53 -05:00
José Valim
8bde477e9d Merge pull request #3114 from zenprogrammer/fix_constantize_doc 
Minor doc fix to String#constantize
 2011-09-23 10:30:15 -07:00
Ryan Oblak
06634f44d0 Minor doc fix to String#constantize 2011-09-23 10:21:34 -07:00
Santiago Pastorino
5dcb269eb8 Merge pull request #3092 from asee/master 
Sprockets to use config.assets.prefix, with tests
 2011-09-23 09:34:04 -07:00
José Valim
36699977f2 Update CHANGELOG for safe_constantize. 2011-09-23 16:49:05 +02:00
José Valim
e8987c30d0 Use safe_constantize where possible. 2011-09-23 16:46:33 +02:00
José Valim
b2f34d1e35 Ensure that constantize just rescues NameError that applies to the constant being currently loaded. 2011-09-23 16:21:49 +02:00
Ryan Oblak
310565f537 Added ActiveSupport::Inflector.safe_constantize and String#safe_constantize; refactored common constantize tests into ConstantizeTestCases 2011-09-23 15:36:33 +02:00
José Valim
d62fc8e021 Update CHANGELOG. 2011-09-23 00:44:55 +02:00
José Valim
48d27363f2 Fix failing tests and add tests for :formats on partial. 2011-09-23 00:42:20 +02:00
Nick Sutterer
552df29cc8 Using #extract_details in PartialRenderer, too! 2011-09-23 00:36:17 +02:00
Nick Sutterer
2e3eb2560b Allow both sym and array for details options in #render. using LC#registered_details to extract options. 2011-09-23 00:36:14 +02:00
Nick Sutterer
f8e6664d86 added tests for render :file/:template and the :formats/:handlers/:locale options. 2011-09-23 00:36:10 +02:00
José Valim
4bfbdc133a Refactor AMo as_json. 2011-09-23 00:19:46 +02:00
José Valim
c19c55582b Merge pull request #3106 from mattetti/master 
ActiveModel JSON serialization bug fix
 2011-09-22 14:24:39 -07:00
Matt Aimonetti
6e78bbea90 fixed a bug with the json serialization when the class setting is set to not include the root, but an instance is serialized with the root option passed as true 2011-09-22 14:05:25 -07:00
Terence Lee
9d46823b5d set env to let rails know we're precompiling 2011-09-22 20:54:02 +02:00
Terence Lee
1de89e5e07 AR wants sqlite3 1.3.4 2011-09-22 20:01:57 +02:00
docunext
c070cc4ab4 Fixes #1489 again, with updated code and numerous tests to confirm 2011-09-22 13:43:08 -04:00
Santiago Pastorino
667ef57de6 No need to create a range object 2011-09-22 14:14:24 -03:00
Santiago Pastorino
855184c468 Merge pull request #3096 from phuibonhoa/master 
FileStore key_file_path does not properly limit filenames to 255 characters
 2011-09-22 10:03:54 -07:00
José Valim
43d27e9105 Deprecate passing the template handler in the template name. 
For example, calling hello.erb is now deprecated. Since Rails 3.0
passing the handler had no effect whatsover. This commit simply
deprecates such cases so we can clean up the code in later releases.
 2011-09-22 15:37:38 +02:00
José Valim
c3fa2e9bf8 Make handlers a registered detail. 2011-09-22 15:06:04 +02:00
José Valim
119e9e2daf Get rid of update_details in favor of passing details to find_template. 2011-09-22 15:03:05 +02:00
Nick Sutterer
cbaad674f1 it is now possible to pass details options (:formats, :details, :locales, ...) to #render, #find_template and friends. this doesn't change anything in global context. 2011-09-22 14:12:36 +02:00