aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | document how to create non show paths from an array of parametersFlorent Guilleux2012-02-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | reverted regular expression fixTima Maslyuchenko2012-02-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:lifo/docrailsTima Maslyuchenko2012-02-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | layout affects views not methodsRajinder Yadav2012-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | fixed regular expression in Specifying Constraints sectionTima Maslyuchenko2012-02-261-2/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #4284 from mattdbridges/time_calculation_aliasesXavier Noria2012-02-286-6/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added aliases for prev_year, prev_month, and prev_week in Time and Date calculations
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Adding :last_week, :last_month, and :last_year aliases to Time and DateMatt Bridges2012-02-216-6/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | core extensions
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5199 from gabehollombe/masterXavier Noria2012-02-281-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The language for describing how to configure ActionController::Base.asset_host could be clearer
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Change asset_host config language to be more helpful and accurateGabe Hollombe2012-02-281-2/+3
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5197 from lest/patch-4José Valim2012-02-271-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | remove unnecessary code
| * | | | | | | | | | | | | | | | | | | | | | | | | | | remove unnecessary codeSergey Nartimov2012-02-281-6/+0
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it was added in 36129f21b86db4bd69e932e586129e246c2a5ca8 but isn't useful anymore as corresponding tests pass without it
* | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "only mutate the scope object in the `bind` method"Aaron Patterson2012-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1b9e19cd22f2b5d5e7b82e042f92340822c0f966.
* | | | | | | | | | | | | | | | | | | | | | | | | | | call binmode on the tempfile for Ruby 1.8 compatibilityAaron Patterson2012-02-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | only mutate the scope object in the `bind` methodAaron Patterson2012-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | bind value creation refactoringAaron Patterson2012-02-271-4/+10
|/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | removing dead codeAaron Patterson2012-02-271-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | use bind values for join columnsAaron Patterson2012-02-276-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5191 from rafaelfranca/fix-393Aaron Patterson2012-02-273-38/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new line after the textarea opening tag.
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add a new line after the textarea opening tag.Rafael Mendonça França2012-02-273-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #393
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5168 from kennyj/fix_5152Aaron Patterson2012-02-272-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [PostgreSQL] Remove NULLS FIRST/LAST. Closes #5152
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 02:07:34 +0000