aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Removing a repetitive comment and refactoring the Application class inwangjohn2013-06-161-24/+7
* 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
|\ \ \ \ \
| * | | | | valid_app_const? -> valid_const?Martin Schürrer2013-06-151-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #10946 from arunagw/build_fix_for_object_const_get_nilXavier Noria2013-06-141-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Changing const_regexp to check for constant name.Arun Agrawal2013-06-151-0/+3
* | | | | Add CHANGELOG entry for #10740Rafael Mendonça França2013-06-141-0/+9
* | | | | Merge pull request #10740 from mrsimo/hash-with-indifferent-access-selectRafael Mendonça França2013-06-142-0/+34
|\ \ \ \ \
| * | | | | HashWithIndifferentAccess#select working as intendedAlbert Llop2013-05-232-0/+34
* | | | | | Merge pull request #10898 from dmitry/find_first_refactor_duplicationRafael Mendonça França2013-06-141-11/+10
|\ \ \ \ \ \
| * | | | | | rename method `find_first_records` to `find_first_with_limit`Dmitry Polushkin2013-06-101-3/+3
| * | | | | | Refactored ActiveRecord `first` method to get rid of duplication.Dmitry Polushkin2013-06-091-11/+10
* | | | | | | Properly namespace DatabaseTasksPiotr Sarnacki2013-06-141-1/+1
* | | | | | | Use DatabaseTasks.env instead of Rails.env in databases.rakePiotr Sarnacki2013-06-141-1/+1
* | | | | | | Merge pull request #10937 from prathamesh-sonpatki/except_exampleYves Senn2013-06-141-0/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Added an example of the query without except before the example with exceptPrathamesh Sonpatki2013-06-141-0/+8
* | | | | | | Merge pull request #10943 from killthekitten/10932_constantize_emptyXavier Noria2013-06-142-5/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix #10932. Treat "" and "::" as invalid on constantizeNikolay Shebanov2013-06-142-5/+10
* | | | | | | Merge pull request #10833 from hone/remove_initialize_on_precompileGuillermo Iguaran2013-06-134-35/+1
|\ \ \ \ \ \ \
| * | | | | | | `initialize_on_precompile` is not used anymore.Terence Lee2013-06-134-35/+1
|/ / / / / / /
* | | | | | | quoted table name is also cachedAaron Patterson2013-06-131-1/+1
* | | | | | | table name is cached on the class, so stop caching twiceAaron Patterson2013-06-131-1/+1
* | | | | | | calculate types on constructionAaron Patterson2013-06-131-8/+4
* | | | | | | only cache the primary key column in one placeAaron Patterson2013-06-131-1/+1
* | | | | | | these methods are never called, so remove themAaron Patterson2013-06-131-8/+0
* | | | | | | This test does not test anything that happens in the real world. If youAaron Patterson2013-06-132-27/+0
* | | | | | | Don't set X-UA-Compatible header by defaultGuillermo Iguaran2013-06-132-5/+2
* | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-06-1458-169/+332
|\ \ \ \ \ \ \