Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | remove unused payloads in blocks in caching instrumentation | Vipul A M | 2013-03-19 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Merge pull request #9811 from neerajdotname/fix-secret-token-sentence | Rafael Mendonça França | 2013-03-19 | 1 | -1/+1 | |
|\ \ \ \ | |_|/ / |/| | | | fix sentence [ci skip] | |||||
| * | | | fix sentence [ci skip] | Neeraj Singh | 2013-03-19 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #9363 from wangjohn/fix_repair_validations | Aaron Patterson | 2013-03-19 | 3 | -2/+66 | |
|\ \ \ | |/ / |/| | | Fixed the repair_validations helper method. | |||||
| * | | The repair_validations helper was not working correctly before because | wangjohn | 2013-03-19 | 3 | -2/+66 | |
|/ / | | | | | | | | | | | it only cleared the validations that created :validate callbacks. This didn't include the validates created by validates_with, so I've added a method to clear all validations. | |||||
* | | Merge pull request #9800 from kennyj/fix_warning_20130319 | Santiago Pastorino | 2013-03-19 | 1 | -1/+1 | |
|\ \ | |/ |/| | Fix warning: mismatched indentatmmismatched indentations at 'end' with 'def' | |||||
| * | Fix warning: mismatched indentatmmismatched indentations at 'end' with 'def' | kennyj | 2013-03-19 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #9792 from vipulnsward/drop_unused_hash | Steve Klabnik | 2013-03-18 | 2 | -3/+3 | |
|\ | | | | | drop an unused hash; change slang to SPECIAL | |||||
| * | drop an unused hash; change slang to SPECIAL | Vipul A M | 2013-03-19 | 2 | -3/+3 | |
|/ | ||||||
* | Initialize @app_env_config now that the var name has changed | Carlos Antonio da Silva | 2013-03-19 | 1 | -1/+1 | |
| | | | | Check 862389c9537dbb6f65fd26c4325e07607ed437b5 for more background. | |||||
* | Use @app_env_config instead of @env_config | José Valim | 2013-03-18 | 1 | -1/+1 | |
| | | | | Check pull request #9789 for more information. | |||||
* | Revert "Merge pull request #9784 from ↵ | Carlos Antonio da Silva | 2013-03-18 | 1 | -4/+4 | |
| | | | | | | | | | | vipulnsward/change_from_blank_to_empty_on_string" This reverts commit 9c4c05fc82e997b722dec4068c3aa27eaee69eb8, reversing changes made to 4620bdcefd0c88905a005f191496df887877b8f3. Reason: They're not completely interchangeable, since blank? will also check for strings containing spaces. | |||||
* | Merge pull request #9784 from vipulnsward/change_from_blank_to_empty_on_string | Carlos Antonio da Silva | 2013-03-18 | 1 | -4/+4 | |
|\ | | | | | Change from blank? to empty? on obvious string values to save extra calls | |||||
| * | change from blank? to empty? on obvious string values to save extra method ↵ | Vipul A M | 2013-03-19 | 1 | -4/+4 | |
| | | | | | | | | calls | |||||
* | | Fix failing tests related to where values change to strings | Carlos Antonio da Silva | 2013-03-18 | 1 | -7/+7 | |
| | | | | | | | | Introduced in 5dc2e3531babcbdc165884d1a47cbcd13455522d. | |||||
* | | Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]" | Xavier Noria | 2013-03-18 | 6 | -6/+6 | |
| | | | | | | | | This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57. | |||||
* | | Merge pull request #9782 from vipulnsward/change_from_each_to_each_key_habtm | Rafael Mendonça França | 2013-03-18 | 2 | -3/+3 | |
|\ \ | | | | | | | Change from each to each_value;drop assignment in habtm | |||||
| * | | 1. Change from each to each_value since we did not use key | Vipul A M | 2013-03-19 | 2 | -3/+3 | |
| |/ | | | | | | | 2. drop assignment of value to sum in test | |||||
* | | instruct RDoc to only parse Ruby files under lib [Fixes #9779] | Xavier Noria | 2013-03-18 | 6 | -6/+6 | |
| | | ||||||
* | | Merge pull request #9022 from braddunbar/digest-basic-auth | Steve Klabnik | 2013-03-18 | 3 | -0/+14 | |
|\ \ | | | | | | | Digest auth should not 500 when given a basic header. | |||||
| * | | Digest auth should not 500 when given a basic header. | Brad Dunbar | 2013-03-18 | 3 | -0/+14 | |
|/ / | ||||||
* | | 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. |