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

7225 Commits

Author SHA1 Message Date
Jon Leighton
fcbde454f6 Don't do remove_possible_method when delegate is used. Two reasons: 1) warnings should be shown, and fixed at the source and 2) the code is slow. Fixes #1937. 2011-07-18 00:22:26 +01:00
Santiago Pastorino
e9bd83402e Merge pull request #2046 from sikachu/master-test_fix 
Fix a wrong assertion on url_helper_test, and add missing `#html_safe?` a
 2011-07-17 12:48:49 -07:00
Prem Sichanugrist
edfb81d668 Fix a wrong assertion on url_helper_test, and refactor html_safe test to be in its method 2011-07-17 15:34:01 -04:00
Santiago Pastorino
7669c33c74 Merge pull request #2018 from bhus/render_partial_invalid_check 
Render partial invalid check
 2011-07-17 12:28:03 -07:00
Xavier Noria
0aec2e7191 indeed, if we are going to remove everything in public/assets on assets:clean, just do that 2011-07-17 00:44:00 +02:00
Xavier Noria
53f6acd252 if we are cleaning all files, we are cleaning all gz files 2011-07-17 00:35:21 +02:00
Santiago Pastorino
296b1eef67 Merge pull request #2082 from htanata/rake_routes_formatting 
Better formatting of rake routes (issue #1991)
 2011-07-16 11:22:58 -07:00
Hendy Tanata
d7f4a3ef78 Fix wildcard route code example in changelog. 2011-07-16 04:27:27 +08:00
Hendy Tanata
193e4de206 Better formatting of route requirements in rake:routes. 
Previously it was:

    {:controller=>"photos", :action=>"show", :id=>/[A-Z]\d{5}/}

Now it becomes:

    photos#show {:id=>/[A-Z]\d{5}/}
 2011-07-16 04:23:05 +08:00
Bradford Folkens
4755930727 assert nothing raised for setting a cookie value to nil in ActionDispatch 2011-07-14 14:01:39 -05:00
Santiago Pastorino
54ab63ee77 Bump rack up 2011-07-13 21:40:46 -03:00
huskins
2668dce1c0 Added view template invalid name check, along with tests. No merges in commit. 2011-07-13 13:06:03 -04:00
José Valim
8f0e0b63f5 assets.cache_store now defaults to filesystem. You will want to share tmp/assets_cache between deploys. 2011-07-12 22:30:17 -03:00
Joseph Wong
66dee26930 Fixed session ID fixation for ActiveRecord::SessionStore 
I have found that Rails will take an invalid session ID specified by the
client and materialize a session based on that session ID. This means
that it is possible, among other things, for a client to use an
arbitrarily weak session ID or for a client to resurrect a previous used
session ID. In other words, we cannot guarantee that all session IDs are
generated by the server and that they are (statistically) unique through
time.

The fix is to always generate a new session ID in #get_session if an
existing session cannot be found under the incoming session ID.

Also added new tests that make sure that an invalid session ID is never
materialized into a new session, regardless of whether it comes in via a
cookie or a URL parameter (when :cookie_only => false).
 2011-07-12 11:09:11 -07:00
Andrew Radev
587dd7d56c Grouped select helper 
FormBuilder#select now works with a nested data structure.
 2011-07-11 19:08:23 +03:00
José Valim
1fdbd4708f Merge pull request #2009 from vatrai/autoload-todo-new 
TODO fix explicitly loading exceptations, autoload removed
 2011-07-11 07:35:43 -07:00
José Valim
3da3df8fcb Require assets in all environments by default and provide a way to opt-out from uglifier. 2011-07-11 11:19:03 -03:00
Vishnu Atrai
525fd3ac86 TODO fix explicitly loading exceptations, autoload removed 2011-07-11 13:14:02 +05:30
Sam Pohlenz
0ac79d0343 Include TagHelper within AssetTagHelper 2011-07-10 12:37:32 +09:30
Xavier Noria
b65bd01d55 Merge branch 'master' of git://github.com/lifo/docrails 2011-07-09 12:20:24 +02:00
Santiago Pastorino
d9182c0ae9 config should always be an AS::InheritableOptions object. Closes #1992 2011-07-08 21:45:53 -03:00
Xavier Noria
ad912c08a9 use Zlib.crc2 rather that bytes.sum, as per Aaron's suggestion 
That integer is rather irrelevant, the only thing that matters is that
it is consistent and with no apparent bias. Zlib.crc32 is 8-10 times
faster than bytes.sum, so use that.
 2011-07-08 00:58:14 +02:00
José Valim
e01aba1504 Move config.default_asset_host_protocol to the railtie. 2011-07-07 19:13:10 -03:00
Akira Matsuda
a3683fd0e4 find(:all) => all 2011-07-08 06:13:21 +09:00
Aaron Patterson
215193d19a removing brittle assertion 2011-07-07 13:12:28 -07:00
Albert Callarisa Roca
f6a6b51ae5 Using the sum of bytes instead the hash of the path when replacing the wildcard of the assets path because in ruby 1.9 is not consistent 2011-07-08 00:10:20 +08: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
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
Xavier Noria
289b5253ce Merge branch 'master' of git://github.com/lifo/docrails 2011-07-05 01:42:13 +02:00
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
Sam Pohlenz
21344bc33b Add documentation for asset_prefix and asset_environment 2011-07-03 10:29:04 +09:30
Damien Mathieu
ac15bcebf2 provide a more explicit message when using url_for with nil 
This fixes the problem of having a non-explicit message when the :location option is not provided in respond_with.
 2011-07-02 18:53:54 +02:00
Vijay Dev
2949e30a05 document handle_unverified_request method 2011-07-02 21:18:46 +05:30
José Valim
13990d50fa require 'thread' before using mutex 2011-07-01 14:52:07 -07:00
Andrew White
2d16515e52 It's autoload all the way down 2011-07-01 21:44:16 +01:00
Andrew White
79924c637d Don't require ActionView::Context as it's autoloaded 2011-07-01 20:36:23 +01:00
Andrew White
505b6a43f7 Revert "Add missing require for ActionView::AssetPaths" 
This reverts commit 987eb7d423.
 2011-07-01 20:34:15 +01:00
Andrew White
fdaecbed84 Add missing requires for ActionView::Context and Module#instance_method_names 2011-07-01 20:17:48 +01:00
Andrew White
987eb7d423 Add missing require for ActionView::AssetPaths 2011-07-01 20:17:48 +01:00
José Valim
3da608e0b4 Revert "Add method fields_for_with_index to FormHelper" 
This reverts commit 7c562d5e46.

Conflicts:

	actionpack/lib/action_view/helpers/form_helper.rb
 2011-07-01 14:52:18 -03:00
Sam Pohlenz
0613f3bcdb Add tests for alternate asset prefix/environment 2011-07-01 21:56:41 +09:30
José Valim
b31ce90e99 Merge pull request #1927 from bogdan/select_multiple_index 
Fixed ActionView::FormOptionsHelper#select with :multiple => false
 2011-07-01 04:31:48 -07:00
Sam Pohlenz
d5f7253206 Refactor sprockets asset paths to allow for alternate asset environments 2011-07-01 17:08:58 +09:30
Vijay Dev
5fe67fa7a3 update doc about resetting the session in case of authenticity token mismatch 2011-07-01 00:00:38 +05:30
José Valim
9c9ec2172e Make sure respond_with with :js tries to render a template in all cases 2011-06-30 11:47:36 -03:00
Bogdan Gusiev
0fdac01876 Fixed ActionView::FormOptionsHelper#select with :multiple => false 2011-06-30 16:27:01 +03:00
Santiago Pastorino
35cdd256c0 Master version is 3.2.0.beta 2011-06-30 10:18:36 -03:00
Santiago Pastorino
a2a7a19d26 Bump up rack-cache and tzinfo 2011-06-30 10:07:26 -03:00
José Valim
f34f0b7e08 Add has_key? and key? methods to CookieJar removed in 0ca69ca65f 2011-06-30 08:01:53 -03:00