aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | [ci skip] Update gem versions for 3.2 and 3.1. Also change some words.Juanito Fatas2013-11-161-9/+10
* | | | Merge pull request #12703 from makimoto/actionsupport-error-set_backtraceRafael Mendonça França2013-11-153-2/+13
|\ \ \ \
| * | | | Use `set_backtrace` instead of `@backtrace` in ActionView errorShimpei Makimoto2013-11-163-2/+13
* | | | | Merge pull request #12904 from sbagdat/patch-1Rafael Mendonça França2013-11-151-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Change Relation#all to Relation#load [ci skip]Sıtkı Bağdat2013-11-151-1/+1
| |/ / /
* / / / test should clean up after themselvesAaron Patterson2013-11-151-0/+3
|/ / /
* | | Merge pull request #12779 from dougbarth/dont_swallow_exceptions_during_trans...Aaron Patterson2013-11-154-10/+10
|\ \ \
| * | | Remove tests for not swallowing exceptions.Doug Barth2013-11-152-42/+0
| * | | Don't swallow exceptions in transctional statementsDoug Barth2013-11-054-10/+52
* | | | Merge pull request #12531 from iamvery/database-tasks-exit-statusRafael Mendonça França2013-11-156-16/+51
|\ \ \ \
| * | | | Explicitly exit with status "1" for create and drop failuresJay Hayes2013-11-116-16/+51
* | | | | Merge pull request #12853 from joshjordan/masterRafael Mendonça França2013-11-151-1/+1
|\ \ \ \ \
| * | | | | Allocate one less object using html_safe during content_tag constructionJosh Jordan2013-11-141-1/+1
* | | | | | Merge pull request #10848 from 907th/add_block_to_cattr_readerRafael Mendonça França2013-11-154-0/+40
|\ \ \ \ \ \