aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix ActiveRecord::Relation#unscopeJon Leighton2013-11-208-23/+45
* swap arguments for some `assert_equal` statements => `expected, actual`Yves Senn2013-11-201-6/+6
* Merge pull request #12824 from sikachu/ps-testing-time-helperXavier Noria2013-11-204-2/+144
|\
| * Add `#travel` and `#travel_to` to AS::TestCasePrem Sichanugrist2013-11-204-2/+144
|/
* Merge pull request #12961 from jbaudanza/docRafael Mendonça França2013-11-191-1/+1
|\
| * Update caching guide with respect to :namespaceJonathan Baudanza2013-11-191-1/+1
|/
* _implied_layout_name should be privateRafael Mendonça França2013-11-191-9/+11
* Use the right indentationRafael Mendonça França2013-11-191-1/+1
* Renderer#_render_template should be privateRafael Mendonça França2013-11-191-7/+7
* Merge pull request #12959 from macmartine/partial_renderer_doc_improvementRafael Mendonça França2013-11-191-1/+1
|\
| * Improve readability of sentence in partial-renderer docs [ci skip]Mac Martine2013-11-191-1/+1
* | use arel nodes to represent non-string `order_values`.Yves Senn2013-11-194-24/+28
|/
* Revert "Properly require database tasks so we have access to the raised const...Rafael Mendonça França2013-11-193-3/+0
* Revert "Explicitly exit with status "1" for create and drop failures"Rafael Mendonça França2013-11-196-51/+16
* use arel `master` and update activerecord to depend on arel `5.0.0`.Yves Senn2013-11-192-2/+2
* use `4-0-stable` arel branch to get bundle working again.Yves Senn2013-11-191-1/+1
* Merge pull request #12949 from akshay-vishnoi/documentationRafael Mendonça França2013-11-191-19/+19
|\
| * [ci skip] `apropriate` => `appropriate`, spaces addedAkshay Vishnoi2013-11-191-19/+19
|/
* Merge pull request #12945 from fluxusfrequency/patch-1Yves Senn2013-11-191-2/+2
|\
| * Fixed typos in shallow routes and routing concernsBen Lewis2013-11-181-2/+2
* | Merge pull request #12942 from kuldeepaggarwal/typosYves Senn2013-11-181-1/+1
|\ \ | |/ |/|
| * `skiping` => `skipping`Kuldeep Aggarwal2013-11-191-1/+1
|/
* Merge pull request #12924 from kuldeepaggarwal/f-specsYves Senn2013-11-181-1/+3
|\
| * added test cases to find notes in a file with .builder extensionKuldeep Aggarwal2013-11-171-1/+3
* | Merge pull request #12931 from yahonda/add_oracle_ignoredYves Senn2013-11-181-1/+1
|\ \
| * | Do not count query for all_constraints and all_tab_cols in OracleYasuo Honda2013-11-181-1/+1
|/ /
* | Merge pull request #12929 from yahonda/test_merging_where_relations_add_orderCarlos Antonio da Silva2013-11-171-1/+1
|\ \
| * | Address test_merging_where_relations failure by adding `order("posts.id")`Yasuo Honda2013-11-181-1/+1
|/ /
* | Add description for db:create and db:drop test tasks in ARCarlos Antonio da Silva2013-11-171-2/+4
* | Properly require database tasks so we have access to the raised constantCarlos Antonio da Silva2013-11-173-0/+3
* | Merge pull request #12928 from vipulnsward/drop_unused_paramCarlos Antonio da Silva2013-11-171-1/+1
|\ \
| * | Drop unused param `should_be_quoted` to `PostgreSQLColumn#array_to_string`Vipul A M2013-11-171-1/+1
| |/
* | Merge pull request #12921 from kuldeepaggarwal/documentation-updationCarlos Antonio da Silva2013-11-171-1/+1
|\ \ | |/ |/|
| * [ci skip]updated documentation: added sass and less extensionsKuldeep Aggarwal2013-11-171-1/+1
|/
* rm minitest monkey patchAaron Patterson2013-11-161-17/+0
* Merge pull request #12919 from arunagw/aa-build-fix-1.9.3Yves Senn2013-11-161-1/+1
|\
| * Build fix for ruby 1.9.3 syntaxArun Agrawal2013-11-161-1/+1
* | pass the pk to compile_updateAaron Patterson2013-11-163-3/+6
|/
* Merge pull request #12918 from versioncontrol/rails-12866Rafael Mendonça França2013-11-163-1/+14
|\
| * Checks to see if the record contains the foreign_key to set the inverse autom...Edo Balvers2013-11-163-1/+14
* | Merge pull request #12859 from jetthoughts/track_initializers_loadingRafael Mendonça França2013-11-164-1/+59
|\ \
| * | Instrument each load config initializerPaul Nikitochkin2013-11-164-1/+59
|/ /
* | Merge pull request #12917 from akshay-vishnoi/refactorRafael Mendonça França2013-11-161-1/+1
|\ \
| * | avoiding iterations and calling of underscore on all elements of arrayAkshay Vishnoi2013-11-171-1/+1
* | | Merge pull request #12911 from zenspider/test_order_dependency_fixesAaron Patterson2013-11-162-14/+26
|\ \ \ | |/ / |/| |
| * | Fix bad test order dependency between LoadAllFixturesTest#test_all_there and ...Ryan Davis2013-11-161-6/+10
| * | Fix bad test order dependency between test/cases/validations/i18n_generate_me...Ryan Davis2013-11-161-8/+16
* | | Merge pull request #12916 from petervandenabeele/typo_4_0_release_notesCarlos Antonio da Silva2013-11-161-1/+1
|\ \ \
| * | | [ci skip] typo in ArgumentError exceptionPeter Vandenabeele2013-11-161-1/+1
|/ / /
* | | Merge pull request #12907 from JuanitoFatas/upgradingRafael Mendonça França2013-11-151-9/+10
|\ \ \