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

8638 Commits

Author SHA1 Message Date
Xavier Noria 7ecd6a731b Merge pull request #5707 from morgoth/remove-unnecessary-block-in-fetch 
removed unnecessary block when using fetch
 2012-04-05 08:55:19 -07:00
José Valim 91cb99e9e4 Merge pull request #4446 from ayamomiji/patch-1 
prevent the cache sweeper ignores NoMethodError
 2012-04-05 06:20:02 -07:00
Santiago Pastorino a9398a7da4 Merge pull request #5716 from jurriaan/tr-gsub-cleanup 
Updated/changed unneeded tr/gsubs
 2012-04-04 10:43:24 -07:00
Oscar Del Ben db86b2a059 No need to extend ActiveSupport::Extend here 2012-04-04 15:28:13 +03:00
Vijay Dev 02b9c22df8 Merge branch 'master' of github.com:lifo/docrails 
Conflicts:
	guides/source/engines.textile
 2012-04-04 12:42:22 +05:30
Alexey Vakhov e39b9b0468 Fix AC responder example 2012-04-04 12:40:39 +06:00
Tieg Zaharia f181d7e3ef minor elsif/else typo fix 2012-04-03 13:45:19 -04:00
Jurriaan Pruis 2d8396fc9f Updated/changed useless tr/gsubs 2012-04-03 15:16:09 +02:00
Alexey Vakhov e527347554 Remove non-obligatory params in AC respond_to examples 2012-04-03 12:43:13 +06:00
Wojciech Wnętrzak f58ff61473 removed unnecessary block when using fetch 2012-04-02 23:43:47 +02:00
Sergey Nartimov e3d1585c8f add type option to atom feed entry builder 
closes #5672
 2012-04-01 20:07:34 +03:00
Santiago Pastorino fa1645a2b7 Merge pull request #5694 from hardipe/master 
Tidy up cookies.rb a bit
 2012-04-01 08:44:03 -07:00
Vijay Dev cf182988f5 Merge branch 'master' of github.com:lifo/docrails 2012-04-01 19:53:29 +05:30
Erich Menge 6e814ce62f :success includes the whole 200 range, not just 200. 
# File lib/rack/response.rb, line 114
114:       def successful?;    @status >= 200 && @status < 300;       end
 2012-04-01 08:39:57 -05:00
José Valim eb154c5299 Merge pull request #5691 from avakhov/form-label-block 
Block version of label should wrapped in field_with_errors in case of error
 2012-04-01 04:45:10 -07:00
hardi d578bd4d1d Useless/Confusing method definition removed 2012-04-01 13:08:18 +03:00
Alexey Vakhov 806f4d8af0 Small #label method refactoring, thanks @rafaelfranca 2012-04-01 10:30:31 +04:00
Alexey Vakhov 7f6bb2d86d Tests :if option of force_ssl method 2012-04-01 09:44:49 +04:00
Alexey Vakhov 889bb4b786 Block version of label should wrapped in field_with_errors in case of error 2012-04-01 08:53:55 +04:00
Santiago Pastorino 67b000ebd5 Remove not needed requires 2012-03-31 15:13:35 -03:00
Piotr Sarnacki 3e75acbc4c Merge pull request #5664 from lest/patch-1 
use `symbolize_keys` instead of `dup.symbolize_keys!`
 2012-03-31 09:30:10 -07:00
Alexey Vakhov 891392a164 Remove obsolete reader from AC::MethodNotAllowed exception class 2012-03-31 00:46:34 +04:00
Alexey Vakhov 0d2a4009ca Remove AC::RenderError class second declaration 2012-03-31 00:30:53 +04:00
Santiago Pastorino 1141f71601 Remove the leading \n added by textarea on assert_select 2012-03-30 11:40:23 -03:00
Sergey Nartimov f4d2695f39 use `symbolize_keys` instead of `dup.symbolize_keys!` 2012-03-30 08:35:50 +03: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
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
ayaya 2ac67358a3 prevent the cache sweeper ignores NoMethodError 2012-03-29 11:09:42 +08: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
Santiago Pastorino f0268d56af Set proper rendered_format when doing render :inline 
Closes #5632
 2012-03-28 18:53:09 -03:00
Tony Primerano e810843300 CSRF messages are no longer controlled by 422.html because InvalidAuthenticityToken is not raised 2012-03-28 16:35:06 -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
Anderson Dias 6410d21220 Fix quotes at select_tag examples 2012-03-28 15:35:32 -03: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
Aaron Suggs 0c525f68f2 Add test for default_url_options[:port] 2012-03-28 13:31:37 +02:00
Jeremy Kemper da5f65676e Merge pull request #5621 from rafaelfranca/fix-2492-master 
Fix label_tag to merge the options hash with the object hash
 2012-03-27 16:15:11 -07:00
Rafael Mendonça França 32763a8244 Check if the options hash already exists and merge it with the another 
hash.

Closes #2492 and #5615
 2012-03-27 19:45:51 -03:00
Santiago Pastorino 33164c8f14 Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-haml-master 
Don't break Haml with textarea newline fix. (master)
 2012-03-27 14:16:04 -07:00
James Coleman 1438e0eb06 Don't break Haml with textarea newline fix. 
See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.)

Also fix 6 more tests that didn't yet have the newline expectation.
 2012-03-27 17:04:08 -04:00
Jens Fahnenbruck 96b72efc00 adds delegetion for eof? to AD::Http::UploadedFile 
if you want to read the file you may need to ask if there is something
to read from
 2012-03-27 22:53:33 +02:00
Vijay Dev b42fbd3ecb Merge branch 'master' of github.com:lifo/docrails 2012-03-27 21:26:37 +05:30
Vijay Dev e01beb5b3b add missing do [ci skip] 2012-03-27 21:19:56 +05:30
Andrey Samsonov 6ce0a6de7e Fixing issue #2492 for master branch. ActionView::Base.field_error_proc doesn't call for label. 
objectify_options method should be applied to the proper options arg.

See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example
 2012-03-27 17:12:07 +04:00
Piotr Sarnacki 67b2404cf9 If partial is rendered in controller, grab format from template 
Previously `rendered_format` was set only based on mime types
passed in Accept header, which was wrong if first type from
Accept was different than rendered partial. The fix is to simply
move setting rendered_format to the place where template
is available and grab format from the template. If it fails
we can fallback to formats passed by Accept header.
 2012-03-27 12:14:56 +02:00
Tim McEwan 7051a234b7 change number_with_precision to not return negative zeros 2012-03-27 19:46:15 +11:00
Alexey Vakhov fbccdf9a96 Proc objects for caches_page no need controller object 2012-03-27 11:54:45 +04:00