Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20117 from jfine/action-mailer-smtp-settings-update | Yves Senn | 2015-06-19 | 1 | -1/+1 |
|\ | |||||
| * | Add openssl_verify_mode and sync other smtp_settings with API docs | Jared Fine | 2015-05-11 | 1 | -1/+1 |
* | | Merge pull request #20259 from rastasheep/rastasheep-patch-1 | Yves Senn | 2015-06-19 | 1 | -2/+2 |
|\ \ | |||||
| * | | Fix typo [ci skip] | Aleksandar Diklic | 2015-05-22 | 1 | -2/+2 |
* | | | Merge pull request #20605 from dcrec1/assert_file | Yves Senn | 2015-06-19 | 4 | -2/+15 |
|\ \ \ | |||||
| * | | | assert_file understands paths with special characters | Diego Carrion | 2015-06-18 | 3 | -2/+10 |
* | | | | Merge pull request #19843 from marshall-lee/explain_cte_queries | Yves Senn | 2015-06-19 | 3 | -1/+10 |
|\ \ \ \ | |||||
| * | | | | Let WITH (CTE) queries be explainable | Vladimir Kochnev | 2015-05-28 | 3 | -1/+10 |
* | | | | | Merge pull request #20630 from y-yagi/fix_references_migration_example | Zachary Scott | 2015-06-18 | 1 | -4/+1 |
|\ \ \ \ \ | |||||
| * | | | | | correct example output of references migration [ci skip] | yuuji.yaginuma | 2015-06-19 | 1 | -4/+1 |
|/ / / / / | |||||
* | | | | | Nitpick :nail_care: [ci skip] | Zachary Scott | 2015-06-18 | 1 | -1/+2 |
* | | | | | Autoload ActiveRecord::RecordInvalid | Rafael Mendonça França | 2015-06-18 | 1 | -0/+1 |
* | | | | | Merge pull request #20549 from maurogeorge/distance_of_time_in_words-rdoc | Zachary Scott | 2015-06-18 | 1 | -0/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Add RDoc about scope option on distance_of_time_in_words | Mauro George | 2015-06-18 | 1 | -0/+20 |
* | | | | | | Merge pull request #20575 from prathamesh-sonpatki/doc-xml-disallowed-types | Zachary Scott | 2015-06-18 | 1 | -1/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added documentation about passing custom disallowed types to Hash#from_xml [... | Prathamesh Sonpatki | 2015-06-18 | 1 | -1/+19 |
* | | | | | | | Merge pull request #20618 from vngrs/fix_railties_tests | Eileen M. Uchitelle | 2015-06-18 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix railties tests | Mehmet Emin İNAÇ | 2015-06-18 | 1 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Tiny documentation fixes [ci skip] | Robin Dupret | 2015-06-18 | 2 | -10/+12 |
* | | | | | | | Merge pull request #20054 from trosborn/master | Robin Dupret | 2015-06-18 | 1 | -77/+107 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | updates caching guide to reflect current Rails capabilities [ci skip] | Thomas Osborn | 2015-06-17 | 1 | -77/+107 |
* | | | | | | | | Merge pull request #20614 from y-yagi/remove_rails_rack_debugger_from_guide | Zachary Scott | 2015-06-17 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | remove `Rails::Rack::Debugger` from guides [ci skip] | yuuji.yaginuma | 2015-06-18 | 1 | -3/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Remove ContentLength middleware from the defaults. | Aaron Patterson | 2015-06-17 | 2 | -1/+5 |
* | | | | | | | | Revert "Merge pull request #20584 from arthurnn/fix_url" | Arthur Neves | 2015-06-17 | 3 | -19/+4 |
* | | | | | | | | Merge pull request #20598 from timrogers/update-bundler-version-to-1-10-4 | Rafael Mendonça França | 2015-06-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update bundler to v1.10.4 | Tim Rogers | 2015-06-17 | 1 | -1/+1 |
* | | | | | | | | | Merge pull request #20596 from vngrs/use_single_quote_in_gemfile | Kasper Timm Hansen | 2015-06-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Use single quote in Railties generators Gemfile [ci skip] | Mehmet Emin İNAÇ | 2015-06-17 | 1 | -1/+1 |
* | | | | | | | | | Bump AMS to 0.10.0.rc2 | Santiago Pastorino | 2015-06-16 | 1 | -1/+1 |
* | | | | | | | | | Merge pull request #20584 from arthurnn/fix_url | Arthur Nogueira Neves | 2015-06-16 | 3 | -4/+19 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Catch InvalidURIError on bad paths on redirect. | Arthur Neves | 2015-06-16 | 3 | -4/+19 |
* | | | | | | | | | | Merge pull request #20587 from vngrs/fix_descriptions_of_databases_rake | Rafael Mendonça França | 2015-06-16 | 1 | -11/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix descriptions of databases.rake [ci skip] | Mehmet Emin İNAÇ | 2015-06-17 | 1 | -11/+11 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #20588 from vngrs/minor_comment_fix | Arthur Nogueira Neves | 2015-06-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix the comment about attr_reader of headers [ci skip] | Mehmet Emin İNAÇ | 2015-06-16 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | enforce a depth limit on XML documents | Aaron Patterson | 2015-06-16 | 3 | -10/+15 |
* | | | | | | | | | | Escape HTML entities in JSON keys | Rafael Mendonça França | 2015-06-16 | 2 | -0/+11 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #20578 from dcrec1/regression | Sean Griffin | 2015-06-16 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | raise ActiveModel::MissingAttributeError when trying to access a relationship... | Diego Carrion | 2015-06-16 | 2 | -1/+5 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #20572 from arthurnn/db_reset | Yves Senn | 2015-06-16 | 1 | -4/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Small refactor on db:reset | Arthur Neves | 2015-06-15 | 1 | -4/+1 |
* | | | | | | | | remove `header=` on the response object. | Aaron Patterson | 2015-06-15 | 3 | -13/+16 |
* | | | | | | | | set the default charset in response initialize | Aaron Patterson | 2015-06-15 | 1 | -4/+12 |
* | | | | | | | | Merge pull request #20407 from vngrs/deprecate_implicit_status_for_head_method | Matthew Draper | 2015-06-16 | 5 | -12/+47 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Deprecate passing hash as first parameter into ActionController::Head | Mehmet Emin İNAÇ | 2015-06-15 | 5 | -12/+47 |
* | | | | | | | | | Merge pull request #20108 from akshay-vishnoi/button-tag | Arthur Nogueira Neves | 2015-06-15 | 2 | -2/+22 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add missing spec and documentation for button_tag helper | Akshay Vishnoi | 2015-05-24 | 2 | -2/+22 |
* | | | | | | | | | | Merge pull request #20257 from prathamesh-sonpatki/test-for-serial-for-quoted... | Arthur Nogueira Neves | 2015-06-15 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Added test case for serial? method when sequence name is not quoted | Prathamesh Sonpatki | 2015-05-22 | 1 | -0/+6 |