| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | Merge pull request #5253 from guilleiguaran/amo-model | Jeremy Kemper | 2012-03-02 | 4 | -0/+44 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Add ActiveModel::Model, a mixin to make plain Ruby objects work with AP out of box | |||||
| | * | | | | | | Add ActiveModel::Model, a mixin to make Ruby objects to work with AP inmediatly | Guillermo Iguaran | 2012-03-02 | 4 | -0/+44 | |
| |/ / / / / / | ||||||
| * | | | / / | Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check ↵ | Santiago Pastorino | 2012-03-03 | 1 | -1/+1 | |
| | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | that info Closes #5245 | |||||
| * | | | | | only log an error if there is a logger. fixes #5226 | Aaron Patterson | 2012-03-02 | 3 | -2/+11 | |
| | | | | | | ||||||
| * | | | | | Can't cache url_options on a controller level | Piotr Sarnacki | 2012-03-02 | 1 | -11/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | It fails if routes from to railties are called in one context, for example: blog.posts_path and main_app.users_path | |||||
| * | | | | | Merge pull request #5243 from lest/patch-2 | José Valim | 2012-03-02 | 1 | -2/+2 | |
| |\ \ \ \ \ | | | | | | | | | | | | | don't pass unnecessary argument | |||||
| | * | | | | | don't pass unnecessary argument | Sergey Nartimov | 2012-03-02 | 1 | -2/+2 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #5242 from rails/opt_routes | José Valim | 2012-03-02 | 9 | -48/+107 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize routes generation in simple cases. If you pass to the route helper the same amount of arguments as the required segments, route generation will be optimized as a string interpolation. After this commit, `post_path(post)` is about 6.5 times faster, `post_url(post)` is about 5 times. | |||||
| | * | | | | | Optimize url helpers. | Sergey Nartimov + José Valim | 2012-03-02 | 6 | -29/+36 | |
| | | | | | | | ||||||
| | * | | | | | Optimize path helpers. | José Valim | 2012-03-02 | 5 | -29/+81 | |
| | | | | | | | ||||||
| * | | | | | | Fix #5238, rendered_format is not set when template is not rendered | Piotr Sarnacki | 2012-03-02 | 2 | -2/+8 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #5241 from carlosantoniodasilva/output-safety | José Valim | 2012-03-02 | 1 | -3/+1 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Stop SafeBuffer#clone_empty from issuing warnings | |||||
| | * | | | | | | Stop SafeBuffer#clone_empty from issuing warnings | Carlos Antonio da Silva | 2012-03-02 | 1 | -3/+1 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logic in clone_empty method was dealing with old @dirty variable, which has changed by @html_safe in this commit: https://github.com/rails/rails/commit/139963c99a955520db6373343662e55f4d16dcd1 This was issuing a "not initialized variable" warning - related to: https://github.com/rails/rails/pull/5237 The logic applied by this method is already handled by the [] override, so there is no need to reset the variable here. | |||||
| * | | | | | | Merge pull request #5234 from benpickles/allow-empty-fieldsets | Piotr Sarnacki | 2012-03-02 | 2 | -2/+11 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Allow empty fieldsets to be created without a block. | |||||
| | * | | | | | Allow fieldsets to be created without a block. | Ben Pickles | 2012-03-01 | 2 | -2/+11 | |
| | | | | | | | ||||||
| * | | | | | | revert setting NOT NULL constraints in add_timestamps | Xavier Noria | 2012-03-01 | 1 | -2/+2 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3dbedd2 added NOT NULL constraints both to table creation and modification. For creation the new default makes sense, but the generic situation for changing a table is that there exist records. Those records have no creation or modification timestamps, and in the general case you don't even know them, so when updating a table these constraints are not going to work. See a bug report for this use case in #3334. | |||||
| * | | | | | Merge pull request #5232 from claudiob/add_release_date_to_docs | Vijay Dev | 2012-03-01 | 6 | -12/+12 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Add release dates to documentation | |||||
| | * | | | | | Add release dates to documentation | claudiob | 2012-03-01 | 6 | -12/+12 | |
| |/ / / / / | | | | | | | | | | | | | | | | Set "March 1, 2012" as the release date for 3.2.2, 3.1.4, 3.0.12 | |||||
| * | | | | | Merge branch 'master-security' | Aaron Patterson | 2012-03-01 | 5 | -29/+63 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master-security: Ensure [] respects the status of the buffer. delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options Conflicts: actionpack/lib/action_view/helpers/tags/base.rb | |||||
| | * | | | | | Ensure [] respects the status of the buffer. | José Valim | 2012-02-29 | 2 | -16/+41 | |
| | | | | | | | ||||||
| | * | | | | | delete vulnerable AS::SafeBuffer#[] | Akira Matsuda | 2012-02-20 | 2 | -12/+0 | |
| | | | | | | | ||||||
| | * | | | | | use AS::SafeBuffer#clone_empty for flushing the output_buffer | Akira Matsuda | 2012-02-20 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | add AS::SafeBuffer#clone_empty | Akira Matsuda | 2012-02-20 | 2 | -0/+15 | |
| | | | | | | | ||||||
| | * | | | | | fix output safety issue with select options | Sergey Nartimov | 2012-02-20 | 2 | -4/+11 | |
| | | | | | | | ||||||
| * | | | | | | Tap, tap goes the middleware | Jeremy Kemper | 2012-02-29 | 1 | -4/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #5203 from avakhov/anonymous-controller-layout | Aaron Patterson | 2012-02-29 | 2 | -0/+16 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix layout lookup for anonymous controller | |||||
| | * | | | | | | Fix layout lookup for anonymous controller | Alexey Vakhov | 2012-02-28 | 2 | -0/+16 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #5219 from ↵ | Aaron Patterson | 2012-02-29 | 3 | -4/+17 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mattfawcett/2781-fix-querystring-route-constraint-for-testing Fix for #2781 | |||||
| | * | | | | | | | Fix the assert_recognizes test method so that it works when there are | Matt Fawcett | 2012-02-24 | 3 | -4/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constraints on the querystring. Issue #2781 | |||||
| * | | | | | | | | fix api doc [ci skip] | Vijay Dev | 2012-03-01 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | adds a nodoc [ci skip] | Vijay Dev | 2012-03-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have an empty api doc page otherwise :) | |||||
| * | | | | | | | | Merge pull request #5221 from kennyj/fix_warning_20120301 | Jeremy Kemper | 2012-02-29 | 1 | -3/+0 | |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | Fix warning: assigned but unused variable | |||||
| | * | | | | | | | Fix warning: assigned but unused variable | kennyj | 2012-03-01 | 1 | -3/+0 | |
| |/ / / / / / / | ||||||
| * | | | | | | | reduced localhost check to two method calls | Aaron Patterson | 2012-02-28 | 1 | -2/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #5214 from bdurand/fix_session_cache_store_require | Jeremy Kemper | 2012-02-28 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | remove unnecessary memcache require in ActionDispatch CacheStore | |||||
| | * | | | | | | | remove unnecessary memcache equire in ActionDispatch::Session::CacheStore | Brian Durand | 2012-02-28 | 1 | -1/+0 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #5212 from MarkMT/master | Xavier Noria | 2012-02-28 | 1 | -8/+19 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | update_only documentation for accepts_nested_attributes_for | |||||
| | * | | | | | | | Modified comments explaining what the update_only option does. | Mark | 2012-02-28 | 1 | -8/+19 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #5208 from ysoslow/ef79b8400f064361b2dbe1ee89f42d2adc103a3c | Aaron Patterson | 2012-02-28 | 1 | -5/+3 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Inject in constantize | |||||
| | * | | | | | | | | Inflector/constantize - inject method lets us to avoid using another variable | homa | 2012-02-28 | 1 | -5/+3 | |
| | | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | | Merge pull request #5196 from lest/patch-3 | José Valim | 2012-02-28 | 2 | -0/+14 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | force datetime attributes to be changed, fix GH #3965 | |||||
| | * | | | | | | | | force datetime attributes to be changed, fix GH #3965 | Sergey Nartimov | 2012-02-28 | 2 | -0/+14 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | minor edits [ci skip] | Vijay Dev | 2012-02-28 | 1 | -2/+2 | |
| | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-28 | 4 | -2/+20 | |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| | * | | | | | | | move the strict validations to an appropriate section and some edits [ci skip] | Vijay Dev | 2012-02-28 | 1 | -14/+12 | |
| | | | | | | | | | ||||||
| | * | | | | | | | copy edits [ci skip] | Vijay Dev | 2012-02-28 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Add brief summary of strict validations added in 3.2. | Oliver Legg | 2012-02-27 | 1 | -0/+14 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Correct NullStore cache store name in caching guide | Toby Matejovsky | 2012-02-27 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | document how to create non show paths from an array of parameters | Florent Guilleux | 2012-02-26 | 1 | -0/+6 | |
| | | | | | | | | | ||||||
| | * | | | | | | | reverted regular expression fix | Tima Maslyuchenko | 2012-02-26 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |