Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #10987 from senny/10979_association_include_returns_true | Xavier Noria | 2013-06-18 | 2 | -12/+12 | |
|\ \ | ||||||
| * | | `CollectionProxy#include?` returns `true` and `false` as documented. | Yves Senn | 2013-06-18 | 2 | -12/+12 | |
* | | | Merge pull request #10986 from wangjohn/changing_rails_env_config | José Valim | 2013-06-17 | 1 | -24/+7 | |
|\ \ \ | ||||||
| * | | | Removing a repetitive comment and removing a deprecation warning. | wangjohn | 2013-06-17 | 1 | -24/+7 | |
|/ / / | ||||||
* | | | Revert "Merge pull request #10961 from wangjohn/changing_rails_env_config" | Santiago Pastorino | 2013-06-17 | 1 | -7/+24 | |
* | | | we only support 1.9+, so just check for a name | Aaron Patterson | 2013-06-17 | 1 | -1/+1 | |
* | | | be consistent about parameter types passed to new_constants_in | Aaron Patterson | 2013-06-17 | 1 | -1/+1 | |
* | | | Merge pull request #10968 from wangjohn/refactoring_rails_application_class | Santiago Pastorino | 2013-06-17 | 2 | -95/+109 | |
|\ \ \ | ||||||
| * | | | Creating a class to build the default middleware stack. | wangjohn | 2013-06-16 | 2 | -95/+109 | |
* | | | | load the file rather than evaling | Aaron Patterson | 2013-06-17 | 1 | -1/+1 | |
* | | | | Merge pull request #10961 from wangjohn/changing_rails_env_config | Santiago Pastorino | 2013-06-17 | 1 | -24/+7 | |
|\ \ \ \ | ||||||
| * | | | | Removing a repetitive comment and refactoring the Application class in | wangjohn | 2013-06-16 | 1 | -24/+7 | |
* | | | | | Merge pull request #10902 from wangjohn/removing_application_singleton_calls | Santiago Pastorino | 2013-06-17 | 12 | -23/+23 | |
|\ \ \ \ \ | ||||||
| * | | | | | Calls to the application constant have been refactored to use | wangjohn | 2013-06-10 | 12 | -23/+23 | |
* | | | | | | just construct real objects rather than mock and stub | Aaron Patterson | 2013-06-17 | 1 | -7/+8 | |
* | | | | | | Merge branch 'master' into mrbrdo-fixserialization | Aaron Patterson | 2013-06-17 | 153 | -573/+1159 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge pull request #10970 from sbagdat/patch-1 | Rafael Mendonça França | 2013-06-17 | 4 | -9/+10 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Use Colspan in th Tags | Sıtkı Bağdat | 2013-06-17 | 4 | -9/+10 | |
| * | | | | | | | Merge pull request #10971 from dtaniwaki/escape_link_to_unless | Rafael Mendonça França | 2013-06-17 | 2 | -1/+6 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | Added test for link_to_unless to make sure the result consistency. | dtaniwaki | 2013-06-16 | 1 | -0/+5 | |
| | * | | | | | | Escape the string even when the condition of link_to_unless is not satisfied. | dtaniwaki | 2013-06-16 | 1 | -1/+1 | |
| * | | | | | | | Merge pull request #10942 from yangchenyun/mine | Yves Senn | 2013-06-16 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | correct documentation about active_record behavior | Steven Yang | 2013-06-15 | 1 | -2/+2 | |
| * | | | | | | | Add CHANGELOG entry for #10969 | Rafael Mendonça França | 2013-06-16 | 1 | -0/+21 | |
| * | | | | | | | Merge pull request #10969 from davidcelis/case-insensitive-asset-path | Rafael Mendonça França | 2013-06-16 | 2 | -3/+6 | |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||||
| | * | | | | | | Use a case insensitive URI Regexp for #asset_path | David Celis | 2013-06-16 | 2 | -3/+6 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #10964 from nashby/collection-html-options | Rafael Mendonça França | 2013-06-16 | 3 | -1/+23 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | collection tags accept html attributes as the last element of collection | Vasiliy Ermolovich | 2013-06-16 | 3 | -1/+23 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #10960 from pacoguzman/fix-build-due-to-10727 | Rafael Mendonça França | 2013-06-15 | 5 | -1/+6 | |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| | * | | | | | Rewind StringIO instances before be parsed again | Paco Guzman | 2013-06-16 | 5 | -0/+5 | |
| | * | | | | | Use xml instead already parsed xml | Paco Guzman | 2013-06-16 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #10727 from pacoguzman/fix-xml-mini-tests | Rafael Mendonça França | 2013-06-15 | 6 | -6/+6 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Compare with the parsed result from REXML backend | Paco Guzman | 2013-05-22 | 6 | -6/+6 | |
| * | | | | | | Merge pull request #10954 from arunagw/update_docs_for_const_regexp | Xavier Noria | 2013-06-15 | 1 | -1/+3 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Updated the doc for const_regexp [ci skip] | Arun Agrawal | 2013-06-15 | 1 | -1/+3 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #10949 from alexpeattie/update_html_boolean_attrs | Rafael Mendonça França | 2013-06-15 | 3 | -4/+14 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Update the HTML boolean attributes per the HTML 5.1 spec | Alex Peattie | 2013-06-14 | 3 | -4/+14 | |
| * | | | | | | | Merge pull request #10533 from vipulnsward/fix_test | Rafael Mendonça França | 2013-06-15 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | ||||||
| | * | | | | | | Make test name descriptive and add reference to original regression commit | Vipul A M | 2013-06-15 | 1 | -1/+2 | |
| * | | | | | | | Merge pull request #10907 from senny/fixtures_and_database_url | Yves Senn | 2013-06-15 | 3 | -4/+21 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | fixture setup does not rely on `AR::Base.configurations`. | Yves Senn | 2013-06-15 | 3 | -4/+21 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #10955 from arunagw/jruby_json_not_required | Rafael Mendonça França | 2013-06-15 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | 'json' gem is no more required under JRuby | Arun Agrawal | 2013-06-15 | 1 | -1/+0 | |
| * | | | | | | | | Merge pull request #10925 from senny/10917_test_to_prevent_regression | Yves Senn | 2013-06-15 | 3 | -3/+36 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | regression test + mysql2 adapter raises correct error if conn is closed. | Yves Senn | 2013-06-15 | 3 | -3/+36 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | cleanup, remove trailing whitespace from AR changelog | Yves Senn | 2013-06-15 | 1 | -4/+4 | |
| * | | | | | | | | Merge pull request #10953 from acapilleri/fix_typos | Yves Senn | 2013-06-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | fix typos | Angelo Capilleri | 2013-06-15 | 1 | -1/+1 | |
| * | | | | | | | | Fix AS changelog [ci skip] | Carlos Antonio da Silva | 2013-06-14 | 1 | -1/+1 | |
| * | | | | | | | | Merge pull request #10950 from appscape-forks/fix-wrong-method-name | Carlos Antonio da Silva | 2013-06-14 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ |