Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #9778 from vipulnsward/fix_typos_in_ar_v1 | Steve Klabnik | 2013-03-18 | 9 | -10/+10 | |
|\ \ | | | | | | | fix typos in AR. lots of them. | |||||
| * | | fix typos in AR. lots of them. | Vipul A M | 2013-03-19 | 9 | -10/+10 | |
| |/ | ||||||
* | | Merge pull request #9202 from gkop/more_helpful_message_when_starting_server | Steve Klabnik | 2013-03-18 | 2 | -2/+2 | |
|\ \ | | | | | | | More helpful message when starting server | |||||
| * | | More helpful message when starting server | Gabe Kopley | 2013-03-18 | 2 | -2/+2 | |
|/ / | | | | | | | v2 of pull request based on feedback from @rafaelfranca, @schneems, and @carlosantoniodasilva | |||||
* | | Merge branch 'master-sec' | Aaron Patterson | 2013-03-18 | 9 | -18/+81 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | * master-sec: fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854] | |||||
| * | | fix protocol checking in sanitization [CVE-2013-1857] | Aaron Patterson | 2013-03-15 | 2 | -2/+12 | |
| | | | ||||||
| * | | JDOM XXE Protection [CVE-2013-1856] | Ben Murphy | 2013-03-15 | 5 | -2/+45 | |
| | | | ||||||
| * | | fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] | Charlie Somerville | 2013-03-15 | 2 | -3/+8 | |
| | | | ||||||
| * | | stop calling to_sym when building arel nodes [CVE-2013-1854] | Aaron Patterson | 2013-03-15 | 2 | -11/+16 | |
| | | | ||||||
* | | | Merge pull request #9669 from senny/rails_method_missing_call | Jeremy Kemper | 2013-03-18 | 2 | -1/+2 | |
|\ \ \ | | | | | | | | | config.ru uses the effective Rack app | |||||
| * | | | config.ru uses the effective Rack app | Yves Senn | 2013-03-15 | 2 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to pass the Rails::Application subclass to #run. The Rails server then called #to_app to convert that class to the actual Rack application. if you surround `#run` with a call to `#map` the server no longer convertes the class to the instance and we end up with unnecessary delegation calls on every request. | |||||
* | | | | Merge pull request #9774 from ↵ | Andrew White | 2013-03-18 | 3 | -0/+15 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | senny/9772_reraise_no_method_error_in_proper_context `TimeWithZone` raises `NoMethodError` in proper context. | |||||
| * | | | | `TimeWithZone` raises `NoMethodError` in proper context. | Yves Senn | 2013-03-18 | 3 | -0/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9772. `TimeWithZone` delegates everything to the wrapped `Time` object using `method_missing`. The result is that `NoMethodError` error will be raised in the context of `Time` which leads to a misleading debug output. | |||||
* | | | | | Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacks | Carlos Antonio da Silva | 2013-03-18 | 3 | -1/+21 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | i18n locale fallback for localized views | |||||
| * | | | | Include I18n fallbacks in :locale lookup context | Juan Barreneche | 2013-03-16 | 3 | -1/+21 | |
| | | | | | ||||||
* | | | | | Merge pull request #9763 from vipulnsward/fix_transliterate_test | Carlos Antonio da Silva | 2013-03-18 | 2 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix repeat of test; remove unused variable by use of each_key | |||||
| * | | | | | fix repeat of test; remove unused variable by use of each_key | Vipul A M | 2013-03-18 | 2 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #9766 from senny/remove_ancient_todos | Carlos Antonio da Silva | 2013-03-18 | 3 | -6/+0 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove ancient TODOs [ci skip] | |||||
| * | | | | | | remove ancient TODOs [ci skip]. | Yves Senn | 2013-03-18 | 3 | -6/+0 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #9771 from vipulnsward/fix_typos_activemodel_v1 | Carlos Antonio da Silva | 2013-03-18 | 3 | -4/+4 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix some typos found in activemodel | |||||
| * | | | | | | fix some typos found in activemodel | Vipul A M | 2013-03-18 | 3 | -4/+4 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #9765 from tkhr/mv-tests-out-from-base_testrb | Carlos Antonio da Silva | 2013-03-18 | 2 | -14/+14 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Move tests out from base_test.rb to inheritance_test.rb | |||||
| * | | | | | | move tests out from base_test.rb | Takehiro Adachi | 2013-03-18 | 2 | -14/+14 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | These tests should be in inheritance_test.rb since its testing a feature which is implemented in inheritance.rb | |||||
* | | | | | | Merge pull request #9677 from neerajdotname/update-comments-about-kotori | Carlos Antonio da Silva | 2013-03-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | SQLite3 3.6.8+ supports nested transactions [ci skip] | |||||
| * | | | | | | SQLite3 3.6.8+ supports nested transactions [ci skip] | Neeraj Singh | 2013-03-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://www.sqlite.org/lang_savepoint.html https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L130-L132 | |||||
* | | | | | | | Merge pull request #9773 from senny/how_to_report_an_issue | Xavier Noria | 2013-03-18 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | refer to the contributing guide on how to create issues. | |||||
| * | | | | | | refer to the contributing guide on how to create issues. | Yves Senn | 2013-03-18 | 1 | -3/+5 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #9762 from senny/8079_do_not_grant_on_root_user | Rafael Mendonça França | 2013-03-17 | 3 | -3/+26 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | `rake db:create` does not change permissions of root user. | |||||
| * | | | | | | `rake db:create` does not change permissions of root user. | Yves Senn | 2013-03-17 | 3 | -3/+26 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #8079. I had to rework some of the tests because the mock allowed any arguments for `connection.exeucte`. I think this is very dangerous as there could anything be executed without the tests noticing it. | |||||
* | / / / / | sets limit 191 for schema_migrations#version in mysql2 if the encoding is ↵ | Xavier Noria | 2013-03-17 | 4 | -5/+58 | |
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | "utf8mb4" Please, see rationale in the included CHANGELOG patch. | |||||
* | | | | | Merge pull request #9754 from macksmind/fix_actionpack_warnings | Rafael Mendonça França | 2013-03-17 | 2 | -2/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix rake test warnings in actionpack | |||||
| * | | | | | Fix rake test warnings in actionpack | Mack Earnhardt | 2013-03-17 | 2 | -2/+3 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #9757 from vipulnsward/remove_message_param | Carlos Antonio da Silva | 2013-03-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | remove unused parameter passed to assert_query_equal method | |||||
| * | | | | | | remove unused parameter passed to assert_query_equal method | Vipul A M | 2013-03-17 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #9745 from madmax/allow_pass_multipart_to_form_for | Carlos Antonio da Silva | 2013-03-17 | 2 | -3/+3 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix regression: allow pass multipart option to form_for | |||||
| * | | | | | | Allow pass multipart option to form_for | Grzegorz Derebecki | 2013-03-17 | 2 | -3/+3 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #9758 from vipulnsward/remove_from_rakefile | Carlos Antonio da Silva | 2013-03-17 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove extra lines from Rakefile, which threw warning | |||||
| * | | | | | | | extra lines from Rakefile removed, which also threw warning | Vipul A M | 2013-03-17 | 1 | -2/+0 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #9759 from vipulnsward/remove_hash_from_tests | Carlos Antonio da Silva | 2013-03-17 | 1 | -16/+10 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | refactor test to drop unnecessary hash creation, test directly instead | |||||
| * | | | | | | refactor test to drop unnecessary hash creation, test directly instead | Vipul A M | 2013-03-17 | 1 | -16/+10 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #9747 from macksmind/refactor_friend_follower | Rafael Mendonça França | 2013-03-16 | 6 | -6/+15 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Refactor Person/Friendship relationships to be more intuitive | |||||
| * | | | | | | Refactor Person/Friendship relationships to be more intuitive | Mack Earnhardt | 2013-03-17 | 6 | -6/+15 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #5210 added a Friendship model to illustrate a bug, but in doing so created a confusing structure because both belongs_to declarations in Friendship referred to the same side of the join. The new structure maintains the integrity of the bug test while changing the follower relationship to be more useful for other testing. | |||||
* | | / / / | Getting Started Guide: typo fix. [ci skip] | Steve Klabnik | 2013-03-16 | 1 | -1/+1 | |
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | There was an s missing in 'views'. Fixes #9752. | |||||
* | | | | | Revert "Merge pull request #8156 from fredwu/acronym_fix-master" | Steve Klabnik | 2013-03-16 | 3 | -8/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 867dc1700f32aae6f98c4651bd501597e6b52bc0, reversing changes made to 9a421aaa8285cf2a7ecb1af370748b0337818930. This breaks anyone who's using ForceSSL: https://travis-ci.org/rails-api/rails-api/jobs/5556065 Please see comments on #8156 for some discussion. | |||||
* | | | | | Update image in Getting Started Guide [ci skip] | Steve Klabnik | 2013-03-16 | 1 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When I updated these images, I must have gotten this one wrong. Now it's right. Fixes #9749. | |||||
* | | | | | revises the CHANGELOG entry from 26aa265 [ci skip] | Xavier Noria | 2013-03-16 | 1 | -2/+3 | |
| | | | | | ||||||
* | | | | | Merge pull request #8156 from fredwu/acronym_fix-master | Xavier Noria | 2013-03-16 | 3 | -1/+7 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix for inflector's incorrect camelCase replacement for acronyms | |||||
| * | | | | Added Inflector#underscore fix to the changelog | Fred Wu | 2013-03-17 | 1 | -0/+4 | |
| | | | | | ||||||
| * | | | | Fixed a bug where the inflector would replace camelCase strings and ↵ | Fred Wu | 2013-03-17 | 2 | -1/+3 | |
|/ / / / | | | | | | | | | | | | | disregarding specified acronyms, fixes #8015 | |||||
* | | | | fixes markup of the CHANGELOG entry from 455d710 | Xavier Noria | 2013-03-16 | 1 | -14/+14 | |
| | | | |