aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #10987 from senny/10979_association_include_returns_trueXavier Noria2013-06-182-12/+12
|\ \
| * | `CollectionProxy#include?` returns `true` and `false` as documented.Yves Senn2013-06-182-12/+12
* | | Merge pull request #10986 from wangjohn/changing_rails_env_configJosé Valim2013-06-171-24/+7
|\ \ \
| * | | Removing a repetitive comment and removing a deprecation warning.wangjohn2013-06-171-24/+7
|/ / /
* | | Revert "Merge pull request #10961 from wangjohn/changing_rails_env_config"Santiago Pastorino2013-06-171-7/+24
* | | we only support 1.9+, so just check for a nameAaron Patterson2013-06-171-1/+1
* | | be consistent about parameter types passed to new_constants_inAaron Patterson2013-06-171-1/+1
* | | Merge pull request #10968 from wangjohn/refactoring_rails_application_classSantiago Pastorino2013-06-172-95/+109
|\ \ \
| * | | Creating a class to build the default middleware stack.wangjohn2013-06-162-95/+109
* | | | load the file rather than evalingAaron Patterson2013-06-171-1/+1
* | | | Merge pull request #10961 from wangjohn/changing_rails_env_configSantiago Pastorino2013-06-171-24/+7
|\ \ \ \
| * | | | Removing a repetitive comment and refactoring the Application class inwangjohn2013-06-161-24/+7
* | | | | Merge pull request #10902 from wangjohn/removing_application_singleton_callsSantiago Pastorino2013-06-1712-23/+23
|\ \ \ \ \
| * | | | | Calls to the application constant have been refactored to usewangjohn2013-06-1012-23/+23
* | | | | | just construct real objects rather than mock and stubAaron Patterson2013-06-171-7/+8
* | | | | | Merge branch 'master' into mrbrdo-fixserializationAaron Patterson2013-06-17153-573/+1159
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #10970 from sbagdat/patch-1Rafael Mendonça França2013-06-174-9/+10
| |\ \ \ \ \ \
| | * | | | | | Use Colspan in th TagsSıtkı Bağdat2013-06-174-9/+10
| * | | | | | | Merge pull request #10971 from dtaniwaki/escape_link_to_unlessRafael Mendonça França2013-06-172-1/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Added test for link_to_unless to make sure the result consistency.dtaniwaki2013-06-161-0/+5
| | * | | | | | Escape the string even when the condition of link_to_unless is not satisfied.dtaniwaki2013-06-161-1/+1
| * | | | | | | Merge pull request #10942 from yangchenyun/mineYves Senn2013-06-161-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | correct documentation about active_record behaviorSteven Yang2013-06-151-2/+2
| * | | | | | | Add CHANGELOG entry for #10969Rafael Mendonça França2013-06-161-0/+21
| * | | | | | | Merge pull request #10969 from davidcelis/case-insensitive-asset-pathRafael Mendonça França2013-06-162-3/+6
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Use a case insensitive URI Regexp for #asset_pathDavid Celis2013-06-162-3/+6
| |/ / / / / /
| * | | | | | Merge pull request #10964 from nashby/collection-html-optionsRafael Mendonça França2013-06-163-1/+23
| |\ \ \ \ \ \
| | * | | | | | collection tags accept html attributes as the last element of collectionVasiliy Ermolovich2013-06-163-1/+23
| |/ / / / / /
| * | | | | | Merge pull request #10960 from pacoguzman/fix-build-due-to-10727Rafael Mendonça França2013-06-155-1/+6
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Rewind StringIO instances before be parsed againPaco Guzman2013-06-165-0/+5
| | * | | | | Use xml instead already parsed xmlPaco Guzman2013-06-161-1/+1
| |/ / / / /
| * | | | | Merge pull request #10727 from pacoguzman/fix-xml-mini-testsRafael Mendonça França2013-06-156-6/+6
| |\ \ \ \ \
| | * | | | | Compare with the parsed result from REXML backendPaco Guzman2013-05-226-6/+6
| * | | | | | Merge pull request #10954 from arunagw/update_docs_for_const_regexpXavier Noria2013-06-151-1/+3
| |\ \ \ \ \ \
| | * | | | | | Updated the doc for const_regexp [ci skip]Arun Agrawal2013-06-151-1/+3
| |/ / / / / /
| * | | | | | Merge pull request #10949 from alexpeattie/update_html_boolean_attrsRafael Mendonça França2013-06-153-4/+14
| |\ \ \ \ \ \
| | * | | | | | Update the HTML boolean attributes per the HTML 5.1 specAlex Peattie2013-06-143-4/+14
| * | | | | | | Merge pull request #10533 from vipulnsward/fix_testRafael Mendonça França2013-06-151-1/+2
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Make test name descriptive and add reference to original regression commitVipul A M2013-06-151-1/+2
| * | | | | | | Merge pull request #10907 from senny/fixtures_and_database_urlYves Senn2013-06-153-4/+21
| |\ \ \ \ \ \ \
| | * | | | | | | fixture setup does not rely on `AR::Base.configurations`.Yves Senn2013-06-153-4/+21
| |/ / / / / / /
| * | | | | | | Merge pull request #10955 from arunagw/jruby_json_not_requiredRafael Mendonça França2013-06-151-1/+0
| |\ \ \ \ \ \ \
| | * | | | | | | 'json' gem is no more required under JRubyArun Agrawal2013-06-151-1/+0
| * | | | | | | | Merge pull request #10925 from senny/10917_test_to_prevent_regressionYves Senn2013-06-153-3/+36
| |\ \ \ \ \ \ \ \
| | * | | | | | | | regression test + mysql2 adapter raises correct error if conn is closed.Yves Senn2013-06-153-3/+36
| |/ / / / / / / /
| * | | | | | | | cleanup, remove trailing whitespace from AR changelogYves Senn2013-06-151-4/+4
| * | | | | | | | Merge pull request #10953 from acapilleri/fix_typosYves Senn2013-06-151-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | fix typosAngelo Capilleri2013-06-151-1/+1
| * | | | | | | | Fix AS changelog [ci skip]Carlos Antonio da Silva2013-06-141-1/+1
| * | | | | | | | Merge pull request #10950 from appscape-forks/fix-wrong-method-nameCarlos Antonio da Silva2013-06-141-1/+1
| |\ \ \ \ \ \ \ \