github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-09 14:48:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
28,542 Commits 34 Branches 105 Tags
3-2-github
Commit Graph

6943 Commits

Author SHA1 Message Date
Bodacious
39b9c943b7 Fixed tag_helper data-attribute bug with BigDecimals 2012-05-20 20:42:16 +01:00
Tom Clarke
565c1b0a07 Prevent concurrent compilation of templates - closes #6400 2012-05-20 12:42:30 -04:00
Carlos Antonio da Silva
c5205041f6 Use right option for excerpt text helper in tests, fix build 
`excerpt` text helper uses `:radius`, not `line_width` (that is used by
`word_wrap` helper).

Also cleanup some whitespaces.
 2012-05-19 18:24:16 -03:00
José Valim
4dd4621f5b Merge pull request #5020 from KL-7/fix-blank-image_tag-source 
Render img tag with empty src if empty string is passed to image_tag.
 2012-05-18 18:26:18 -03:00
Jeremy Walker
616c91db0a Deprecate old APIs for highlight, excerpt and word_wrap 2012-05-18 15:19:58 +01:00
Carlos Galdino + Rafael Mendonça França
e9051e20ae Deprecate :disable_with for button_tag too 2012-05-14 16:55:13 -03:00
Carlos Galdino + Rafael Mendonça França
d47d6e7eda Fix typo 2012-05-14 16:43:54 -03:00
Carlos Galdino + Rafael Mendonça França
21141e777b Deprecate :disable_with in favor of 'data-disable-with' option for button_to and submit_tag helpers. 2012-05-14 16:43:54 -03:00
Rafael Mendonça França
1aff7725c7 Deprecate :mouseover options for image_tag helper. 2012-05-13 19:49:24 -03:00
Rafael Mendonça França
9ff97b0605 Merge pull request #3237 from sakuro/data-url-scheme 
Support data: url scheme
 2012-05-13 19:17:28 -03:00
Andrew White
66e338aa98 Don't ignore nil positional arguments for url helpers - fixes #6196. 2012-05-10 22:13:04 +01:00
Andrew White
f3aaac46e6 Refactor the handling of default_url_options in integration tests 
This commit improves the handling of default_url_options in integration
tests by making behave closer to how a real application operates.

Specifically the following issues have been addressed:

* Options specified in routes.rb are used (fixes #546)
* Options specified in controllers are used
* Request parameters are recalled correctly
* Tests can override default_url_options directly
 2012-05-10 21:12:31 +01:00
Santiago Pastorino
f8dae865b5 Merge pull request #6149 from jmbejar/javascript_include_tag_with_not_duplicates 
Make sure that javascript_include_tag/stylesheet_link_tag methods don't consider duplicated assets
 2012-05-09 12:36:20 -07:00
Kunal Shah
4d52738738 If content_type is explicitly passed to the :head method use the value or fallback 2012-05-07 18:56:36 -04:00
Nick Ragaz
bfb25f9cae Add a role option to wrap_parameters. 
The role option identifies which parameters are accessible and should be wrapped. The default role is :default.
 2012-05-04 10:14:14 -04:00
Jorge Bejar
0621ecb20b Make sure that javascript_include_tag/stylesheet_link_tag methods in 
sprockets/helpers/rails_helper.rb discard duplicated assets
 2012-05-03 19:07:03 -03:00
Andrew White
7c7fb3a862 Reset the request parameters after a constraints check 
A callable object passed as a constraint for a route may access the request
parameters as part of its check. This causes the combined parameters hash
to be cached in the environment hash. If the constraint fails then any subsequent
access of the request parameters will be against that stale hash.

To fix this we delete the cache after every call to `matches?`. This may have a
negative performance impact if the contraint wraps a large number of routes as the
parameters hash is built by merging GET, POST and path parameters.

Fixes #2510.
(cherry picked from commit 56030506563352944fed12a6bb4793bb2462094b)
 2012-05-03 00:00:19 +01:00
Dmitry Vorotilin
df8457748e Fix #3993 assets:precompile task does not detect index files 2012-05-01 03:53:13 +04:00
Will Bryant
e3069c64b2 fix the Flash middleware loading the session on every request (very dangerous especially with Rack::Cache), it should only be loaded when the flash method is called 2012-04-30 00:17:27 -07:00
Andrew White
a72fe84d00 Add note about using 303 See Other for XHR requests other than GET/POST 
IE since version 6 and recently Chrome and Firefox have started following
302 redirects from XHR requests other than GET/POST using the original request
method. This can lead to DELETE requests being redirected amongst other things.

Although it doesn't directly affect the Rails framework since it doesn't return
a 302 redirect to any non-GET/POST request a note has been added to raise
awareness of the issue. Some references:

Original article from @technoweenie:
http://techno-weenie.net/2011/8/19/ie9-deletes-stuff/

Hacker News discussion of the article:
http://news.ycombinator.com/item?id=2903493

WebKit bug report:
https://bugs.webkit.org/show_bug.cgi?id=46183

Firefox bug report and changeset:
https://bugzilla.mozilla.org/show_bug.cgi?id=598304
https://hg.mozilla.org/mozilla-central/rev/9525d7e2d20d

Chrome bug report:
http://code.google.com/p/chromium/issues/detail?id=56373

HTTPbis bug report and changeset:
http://trac.tools.ietf.org/wg/httpbis/trac/ticket/160
http://trac.tools.ietf.org/wg/httpbis/trac/changeset/1428

Roy T. Fielding's history of the issue:
http://ftp.ics.uci.edu/pub/ietf/http/hypermail/1997q3/0611.html

Automated browser tests for the issue:
http://www.mnot.net/javascript/xmlhttprequest/

Fixes #4144
(cherry picked from commit 24f143789a8989f3bccde14ff28067de25cafd87)
 2012-04-30 06:59:15 +01:00
Rafael Mendonça França
9dc57fe9c4 Deprecate link_to_function and button_to_function helpers 2012-04-30 01:40:18 -03:00
Rafael Mendonça França
6b8a3a0a51 Add missing require when helpers are used in isolation 2012-04-30 01:39:11 -03:00
Andrew White
6cad407623 Restore interpolation of path option in redirect routes 2012-04-29 22:51:04 +01:00
Andrew White
4075a39453 Add missing require from b608cdd64c 2012-04-29 22:41:00 +01:00
Andrew White
b608cdd64c Escape interpolated params when redirecting - fixes #5688 2012-04-29 21:19:18 +01:00
Andrew White
d6bbd337ef Don't convert params if the request isn't HTML - fixes #5341 
(cherry picked from commit 7a80b69e00f68e673c6ceb5cc684aa9196ed3d9f)

Conflicts:

	actionpack/test/controller/test_test.rb
 2012-04-29 10:27:17 +01:00
Piotr Sarnacki
beba8267c9 Lazy load default_form_builder if it's passed as a string 
closes #3341
 2012-04-28 23:02:39 -07:00
Carlos Antonio da Silva
7006e975ac Do not mutate options hash 2012-04-27 18:34:20 -04:00
Vijay Dev
006de2577a fix number_to_human docs [ci skip] 2012-04-26 15:29:14 +05:30
Tieg Zaharia
6b8dd70083 converting some tests to assert_raises, and DRY'ing retrieve_variable changes 
Conflicts:

	actionpack/test/template/render_test.rb
 2012-04-16 15:37:51 -04:00
Tieg Zaharia
dcc11b2282 catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead 2012-04-16 13:53:51 -04:00
Rafael Mendonça França
27fc6ec95e Fix the redirect when it receive blocks with arity of 1. 
Closes #5677
 2012-03-31 17:59:21 +02:00
Santiago Pastorino
69465d9f7c Merge branch '3-2-3' into 3-2-stable 2012-03-30 19:34:33 -03:00
Santiago Pastorino
45d6cd94b3 Bump up to 3.2.3 2012-03-30 19:22:28 -03:00
Santiago Pastorino
5c7bb86a1b Remove the leading \n added by textarea on assert_select 2012-03-30 11:45:12 -03:00
Santiago Pastorino
13fe1903d8 Remove the leading \n added by textarea on assert_select 2012-03-30 11:44:15 -03:00
Santiago Pastorino
5284e650be Bumping to 3.2.3.rc2 2012-03-29 13:12:44 -03:00
Santiago Pastorino
87825a6ab5 Set proper rendered_format when doing render :inline 
Closes #5632
 2012-03-28 18:55:14 -03:00
Santiago Pastorino
5747e53c92 Set proper rendered_format when doing render :inline 
Closes #5632
 2012-03-28 18:54:12 -03:00
Piotr Sarnacki
db2c1354eb 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:10:44 +02:00
Piotr Sarnacki
d5980b5f52 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:09:53 +02:00
Santiago Pastorino
84ca8c8cd0 Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms 
Embed auth token in remote forms
 2012-03-28 10:58:57 -03:00
Piotr Sarnacki
d646d9d2e7 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)
 2012-03-28 14:37:23 +02:00
Jeremy Kemper
460d2c7c28 Merge pull request #5622 from rafaelfranca/fix-2492-3-2 
[3-2-stable] Fix label_tag to merge the options hash with the object hash
 2012-03-27 16:15:21 -07:00
Rafael Mendonça França
6968bc16a1 Check if the options hash already exists and merge it with the another 
hash.

Closes #2492 and #5614
 2012-03-27 20:01:59 -03:00
Santiago Pastorino
4f66586bbf Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml 
Textarea newline fix breaks haml (3-2-stable)
 2012-03-27 18:17:26 -03:00
Santiago Pastorino
d82e4c80a8 Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml 
Textarea newline fix breaks haml (3-2-stable)
 2012-03-27 14:16:15 -07:00
James Coleman
a7a422ec97 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:00:39 -04:00
Santiago Pastorino
5f37260918 Bumping to 3.2.3.rc1 2012-03-27 14:07:36 -03:00
Andrey Samsonov
7111133371 Fixing issue #2492. 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 16:30:08 +04:00