mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
29,237 Commits 61 Branches 565 Tags 420 MiB
Commit Graph

29237 Commits

Author SHA1 Message Date
Aaron Patterson ad95a61b62 Merge pull request #4911 from Floppy/master 
Reduce FILENAME_MAX_SIZE in ActiveSupport::Cache::FileStore
 2012-03-30 17:43:55 -07:00
Piotr Sarnacki c3d482f0b2 Merge pull request #5673 from avakhov/ac-render-exception 
Remove AC::RenderError class second declaration
 2012-03-30 13:41:01 -07:00
Alexey Vakhov 0d2a4009ca Remove AC::RenderError class second declaration 2012-03-31 00:30:53 +04:00
Jon Leighton 86aefdb4f2 Fix #5667. Preloading should ignore scoping. 2012-03-30 16:19:32 +01:00
Santiago Pastorino 1141f71601 Remove the leading \n added by textarea on assert_select 2012-03-30 11:40:23 -03:00
Jon Leighton 1ce75450a9 clear up duplication between Persistence#destroy and Locking#destroy 2012-03-30 14:39:55 +01:00
Jon Leighton 43f9622c67 fix test 2012-03-30 14:37:37 +01:00
Jon Leighton bd40e5c9e4 whitespace ✂️ 2012-03-30 14:36:33 +01:00
Jon Leighton 2eb111815d Merge pull request #5334 from courtland/master 
Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled.
 2012-03-30 06:08:05 -07:00
José Valim 34320cd6ba Merge pull request #5668 from plashchynski/validate_attribute_name_in_class_and_module_attribute_accessors 
validate attribute names in class and module attribute accessors
 2012-03-30 06:04:01 -07:00
Jon Leighton b69298e01d fix typo. thanks @nertzy 2012-03-30 13:58:51 +01:00
Dmitry Plashchynski 96b951ce24 validate attribute names in class and module attribute accessors 2012-03-30 15:45:46 +03:00
Jon Leighton 84338aab90 Update guides to reflect 0a12a5f816 2012-03-30 13:15:47 +01:00
Jon Leighton 96b819210e remove irrelevant references to ARel 2012-03-30 13:07:00 +01:00
Jon Leighton 13b3c77e39 Add Relation#find_by and Relation#find_by! 2012-03-30 12:52:29 +01:00
Jon Leighton 3a8c54396e Merge pull request #2945 from Casecommons/nested_attributes_module 
Nested attribute setters can be overridden.
 2012-03-30 03:25:30 -07:00
Jon Leighton 7dd7d76b86 recurse in read_attribute we get caching / don't duplicate code 2012-03-30 11:09:27 +01:00
Aaron Patterson 130064d504 Merge pull request #5661 from carlosantoniodasilva/ar-pk-typecast 
Typecast 'id' attribute in read_attribute when using custom pks
 2012-03-29 19:19:08 -07:00
Carlos Antonio da Silva f50c160cd0 Deprecate Column#type_cast_code 2012-03-29 23:04:51 -03:00
Carlos Antonio da Silva 77a0fc1c7a Properly typecast id attribute when using custom primary key 2012-03-29 22:59:30 -03:00
Jeremy Kemper 648248bbb1 Merge pull request #5345 from guilleiguaran/ar-slice 
post.slice(:title, :content) # => { title: "Hello", content: "World" }
 2012-03-29 16:25:50 -07:00
Guillermo Iguaran bb2e2d8cb6 CHANGELOG entry for AR#slice 2012-03-29 17:50:06 -05:00
Guillermo Iguaran 01ede9a211 Add ActiveRecord::Base#slice to slice method calls 2012-03-29 17:48:35 -05:00
Aaron Patterson 1555023973 Merge pull request #5617 from Empact/paths 
Spring cleaning in Rails::Paths
 2012-03-29 14:54:03 -07:00
Ben Woosley cec170b963 Define Paths::Root#[]= in terms of #add. 2012-03-29 02:55:04 -07:00
Ben Woosley f7a39c848a Drop Paths::Root initializer check of #path as it isn't checked in the #path= or anywhere else 2012-03-29 02:53:25 -07:00
Ben Woosley 4977e14e1b Drop unnecessary require in Rails::Paths 2012-03-29 01:21:28 -07:00
José Valim e51322a34b Merge pull request #5625 from nertzy/prefix_partial_path_with_controller_namespace 
Add config option to turn off prefixing partial path with controller namespace
 2012-03-28 23:51:34 -07:00
José Valim e83e76eca4 Merge pull request #4904 from ask4prasath/refactor_dirty_module_with_helper 
Changing active model dirty module helper method to more appropriate met...
 2012-03-28 23:47:12 -07:00
Santiago Pastorino c4d90e4204 Merge pull request #5359 from avakhov/missed-commits-from-3-2-stable 
Missed commits from 3-2-stable
 2012-03-28 20:32:09 -07:00
Grant Hutchins 18d275ada1 Make controller namespace partial prefix optional 
config.action_view.prefix_partial_path_with_controller_namespace

This allows you to choose to render @post using
/posts/_post.erb instead of /admin/posts/_post.erb
inside Admin::PostsController.
 2012-03-28 20:21:46 -04:00
Grant Hutchins a0e83d5af7 Test that render gets correct exact template name 2012-03-28 19:42:20 -04:00
Jonathan Mukai & Peter Jaros 135d704a55 Nested attribute setters can be overridden. 
Overriding implementation can call super.
 2012-03-28 19:08:31 -04:00
Xavier Noria bbd2caeaf9 Merge pull request #4843 from seamusabshere/patch-1 
Possibly clearer way of getting rid of ` and "
 2012-03-28 16:01:05 -07:00
Santiago Pastorino ddaeb4b6cf Merge pull request #5643 from rafaelfranca/remove-duplication 
Remove code duplication in InclusionValidator and ExclusionValidator.
 2012-03-28 15:13:29 -07:00
Rafael Mendonça França 170956cdae Remove code duplication in InclusionValidator and ExclusionValidator. 
Orginal code by @jamescook

Closes #1352

[Rafael Mendonça França + James Cook]
 2012-03-28 18:57:56 -03:00
Santiago Pastorino f0268d56af Set proper rendered_format when doing render :inline 
Closes #5632
 2012-03-28 18:53:09 -03:00
Michael de Silva 77088196e9 clarification to prevent confusing newbies; Passenger/Unicorn are app servers, Apache/Nginx are the web servers along with thin a la Heroku etc. 2012-03-28 23:06:52 +04:00
Joe Van Dyk b9cbadf1e3 datetime_select should work with -/+ infinity dates 2012-03-28 23:06:52 +04:00
José Valim dd0275e463 Add a test case for layout nil. 2012-03-28 23:06:52 +04:00
Piotr Sarnacki c82fd8fc2a Allow ActiveModel::Name to duck type 2012-03-28 18:25:06 +02:00
Piotr Sarnacki 5a5ca14cb2 Cover one more case in auth_token and remote forms 
If embedding auth_token in remote forms is off and we
pass a value for auth_token it should respect it.
 2012-03-28 18:03:16 +02:00
Piotr Sarnacki 128cfbdf4d config.action_view.embed_authenticity_token_in_remote_forms is true by default 
Changed default value for `config.action_view.embed_authenticity_token_in_remote_forms`
to `false`. This change breaks remote forms that need to work also without javascript,
so if you need such behavior, you can either set it to `true` or explicitly pass
`:authenticity_token => true` in form options
 2012-03-28 18:03:16 +02:00
Piotr Sarnacki 805b15ff35 Added config.action_view.embed_authenticity_token_in_remote_forms 
There is a regression introduced in 16ee611fa, which breaks
remote forms that should also work without javascript. This commit
introduces config option that allows to configure this behavior
defaulting to the old behavior (ie. include authenticity token
in remote forms by default)

Conflicts:

	actionpack/CHANGELOG.md
 2012-03-28 18:03:15 +02:00
Jon Leighton 6cff09038d much code can be deleted thanks to @tenderlove's refactoring 2012-03-28 16:38:38 +01:00
Santiago Pastorino 9897b9a689 Merge pull request #5630 from andhapp/fix-config-asset-manifest 
Changed the config.assets.manifest to nil
 2012-03-28 07:45:39 -07:00
Aaron Suggs 0c525f68f2 Add test for default_url_options[:port] 2012-03-28 13:31:37 +02:00
José Valim 0560ce0b29 Merge pull request #2528 from cesario/fix_2507 
Rails.initialized? can be called at any time without raising an exception [Closes #2507]
 2012-03-28 01:19:30 -07:00
José Valim 647ccdcad4 Merge pull request #5623 from Houdini/master 
Remove redundant variable from core_ext/hash/deep_dup.rb
 2012-03-28 01:18:09 -07:00
Anuj Dutta 77fedae3ce Changed the config.assets.manifest to nil in the comments in the production config template. 2012-03-28 06:48:54 +00:00