aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge pull request #5256 from carlosantoniodasilva/active-model-modelJosé Valim2012-03-033-1/+81
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | Add docs with usage examples for ActiveModel::Model
| * | | | | | | | | | | Add docs with usage examples for ActiveModel::ModelCarlos Antonio da Silva2012-03-033-1/+81
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add test to ensure basic model does not explode when initialized with nil.
* | | | | | | | | | | Merge pull request #5253 from guilleiguaran/amo-modelJeremy Kemper2012-03-024-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 inmediatlyGuillermo Iguaran2012-03-024-0/+44
|/ / / / / / / / / / /
* | | | / / / / / / / Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check ↵Santiago Pastorino2012-03-031-1/+1
| |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that info Closes #5245
* | | | | | | | | | only log an error if there is a logger. fixes #5226Aaron Patterson2012-03-023-2/+11
| | | | | | | | | |
* | | | | | | | | | Can't cache url_options on a controller levelPiotr Sarnacki2012-03-021-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-2José Valim2012-03-021-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | don't pass unnecessary argument
| * | | | | | | | | | don't pass unnecessary argumentSergey Nartimov2012-03-021-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #5242 from rails/opt_routesJosé Valim2012-03-029-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é Valim2012-03-026-29/+36
| | | | | | | | | | |
| * | | | | | | | | | Optimize path helpers.José Valim2012-03-025-29/+81
| | | | | | | | | | |
* | | | | | | | | | | Fix #5238, rendered_format is not set when template is not renderedPiotr Sarnacki2012-03-022-2/+8
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5241 from carlosantoniodasilva/output-safetyJosé Valim2012-03-021-3/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Stop SafeBuffer#clone_empty from issuing warnings
| * | | | | | | | | | | Stop SafeBuffer#clone_empty from issuing warningsCarlos Antonio da Silva2012-03-021-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-fieldsetsPiotr Sarnacki2012-03-022-2/+11
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Allow empty fieldsets to be created without a block.
| * | | | | | | | | | Allow fieldsets to be created without a block.Ben Pickles2012-03-012-2/+11
| | |_|_|_|/ / / / / | |/| | | | | | | |
* / | | | | | | | | revert setting NOT NULL constraints in add_timestampsXavier Noria2012-03-011-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_docsVijay Dev2012-03-016-12/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add release dates to documentation
| * | | | | | | | | Add release dates to documentationclaudiob2012-03-016-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 Patterson2012-03-015-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é Valim2012-02-292-16/+41
| | | | | | | | | |
| * | | | | | | | | delete vulnerable AS::SafeBuffer#[]Akira Matsuda2012-02-202-12/+0
| | | | | | | | | |
| * | | | | | | | | use AS::SafeBuffer#clone_empty for flushing the output_bufferAkira Matsuda2012-02-201-1/+1
| | | | | | | | | |
| * | | | | | | | | add AS::SafeBuffer#clone_emptyAkira Matsuda2012-02-202-0/+15
| | | | | | | | | |
| * | | | | | | | | fix output safety issue with select optionsSergey Nartimov2012-02-202-4/+11
| | | | | | | | | |
* | | | | | | | | | Tap, tap goes the middlewareJeremy Kemper2012-02-291-4/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5203 from avakhov/anonymous-controller-layoutAaron Patterson2012-02-292-0/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix layout lookup for anonymous controller
| * | | | | | | | | | Fix layout lookup for anonymous controllerAlexey Vakhov2012-02-282-0/+16
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5219 from ↵Aaron Patterson2012-02-293-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 areMatt Fawcett2012-02-243-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constraints on the querystring. Issue #2781
* | | | | | | | | | | | fix api doc [ci skip]Vijay Dev2012-03-011-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | adds a nodoc [ci skip]Vijay Dev2012-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have an empty api doc page otherwise :)
* | | | | | | | | | | | Merge pull request #5221 from kennyj/fix_warning_20120301Jeremy Kemper2012-02-291-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | Fix warning: assigned but unused variable
| * | | | | | | | | | | Fix warning: assigned but unused variablekennyj2012-03-011-3/+0
|/ / / / / / / / / / /
* | | | | | | | | | | reduced localhost check to two method callsAaron Patterson2012-02-281-2/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5214 from bdurand/fix_session_cache_store_requireJeremy Kemper2012-02-281-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | remove unnecessary memcache require in ActionDispatch CacheStore
| * | | | | | | | | | | remove unnecessary memcache equire in ActionDispatch::Session::CacheStoreBrian Durand2012-02-281-1/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #5212 from MarkMT/masterXavier Noria2012-02-281-8/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | update_only documentation for accepts_nested_attributes_for
| * | | | | | | | | | | Modified comments explaining what the update_only option does.Mark2012-02-281-8/+19
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5208 from ysoslow/ef79b8400f064361b2dbe1ee89f42d2adc103a3cAaron Patterson2012-02-281-5/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Inject in constantize
| * | | | | | | | | | | | Inflector/constantize - inject method lets us to avoid using another variablehoma2012-02-281-5/+3
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5196 from lest/patch-3José Valim2012-02-282-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | force datetime attributes to be changed, fix GH #3965
| * | | | | | | | | | | | force datetime attributes to be changed, fix GH #3965Sergey Nartimov2012-02-282-0/+14
| | | | | | | | | | | | |
* | | | | | | | | | | | | minor edits [ci skip]Vijay Dev2012-02-281-2/+2
| |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-284-2/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | move the strict validations to an appropriate section and some edits [ci skip]Vijay Dev2012-02-281-14/+12
| | | | | | | | | | | |
| * | | | | | | | | | | copy edits [ci skip]Vijay Dev2012-02-281-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Add brief summary of strict validations added in 3.2.Oliver Legg2012-02-271-0/+14
| | | | | | | | | | | |
| * | | | | | | | | | | Correct NullStore cache store name in caching guideToby Matejovsky2012-02-271-1/+1
| | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 04:42:24 +0000