aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Dev and edge application and plugins need to include i18n masterRafael Mendonça França2014-07-231-1/+2
* Merge pull request #16267 from robin850/rbx-yamlRafael Mendonça França2014-07-233-0/+28
|\
| * Set Psych as the YAML engine for RubiniusRobin Dupret2014-07-233-0/+28
* | Do not set enforce_available_locales to i18n 0.7Rafael Mendonça França2014-07-233-22/+4
* | Split Action Pack tests in a new job on travisRafael Mendonça França2014-07-231-1/+2
* | Use PROCESS_COUNT to define the number of parallel executorsRafael Mendonça França2014-07-231-1/+1
* | specify N=0 to prevent parallel tests (just run tests on the main process)Aaron Patterson2014-07-231-2/+6
|/
* Merge pull request #16237 from tonytonyjan/patchArthur Nogueira Neves2014-07-231-4/+5
|\
| * `create` return an active record object with erros instead of false when vali...Tony Jian2014-07-231-4/+5
* | Merge pull request #16234 from tgxworld/fix_template_assertion_for_integratio...Yves Senn2014-07-223-5/+66
|\ \
| * | Fix AC::TemplateAssertions instance variables not resetting.Guo Xiang Tan2014-07-213-5/+66
| |/
* | Merge pull request #16256 from akshay-vishnoi/doc-changeRafael Mendonça França2014-07-221-1/+1
|\ \
| * | Fixes #16255 [ci skip]Akshay Vishnoi2014-07-221-1/+1
|/ /
* | Merge pull request #16231 from Envek/type_in_referencesYves Senn2014-07-226-5/+56
|\ \
| * | Allow to specify a type for foreign key column in migrationsAndrey Novikov2014-07-226-3/+46
|/ /
* | Merge pull request #16253 from zuhao/refactor_activerecord_nested_through_ass...Yves Senn2014-07-221-1/+1
|\ \
| * | Make sure assertion passes for postgresql.Zuhao Wan2014-07-221-1/+1
* | | Merge pull request #16254 from zuhao/refactor_activerecord_attribute_decorato...Yves Senn2014-07-221-1/+0
|\ \ \ | |/ / |/| |
| * | Remove redundant that already happened in teardown.Zuhao Wan2014-07-221-1/+0
|/ /
* | build fix, remove not null constraint.Yves Senn2014-07-221-1/+1
* | Merge pull request #16250 from zuhao/refactor_activerecord_migration_testYves Senn2014-07-221-1/+1
|\ \
| * | Remove length limit that results failure in other tests.Zuhao Wan2014-07-221-1/+1
* | | docs, add example for running a single test against core adapters.Yves Senn2014-07-221-0/+6
* | | Merge pull request #16248 from zuhao/refactor_activerecord_presence_validatio...Yves Senn2014-07-221-2/+3
|\ \ \ | |/ / |/| |
| * | Remove the side-effects of validates_presence_of.Zuhao Wan2014-07-221-2/+3
|/ /
* | Merge pull request #16232 from egilburg/activesupport_coverageRafael Mendonça França2014-07-2111-4/+114
|\ \
| * | missing activesupport test coverageEugene Gilburg2014-07-1911-4/+114
| |/
* | Merge pull request #16239 from akshay-vishnoi/remove-requireRafael Mendonça França2014-07-211-1/+0
|\ \
| * | Remove not-required file class/subclassesAkshay Vishnoi2014-07-211-1/+0
* | | Merge pull request #16242 from vadivelan-k/content_verifierArthur Nogueira Neves2014-07-211-1/+1
|\ \ \
| * | | Touch option description grammatical error fixed [ci skip]vadivelan2014-07-211-1/+1
|/ / /
* | | Merge pull request #16240 from siddharthbhagwan/masterEileen M. Uchitelle2014-07-211-1/+1
|\ \ \ | |/ / |/| |
| * | Generator guide grammatical error fixed [ci skip]Siddharth Bhagwan2014-07-211-1/+1
|/ /
* | Merge pull request #16236 from y-yagi/patch-1Yves Senn2014-07-211-1/+1
|\ \ | |/ |/|
| * [ci skip] Fix code in Routing Guideyuuji.yaginuma2014-07-211-1/+1
|/
* Merge branch 'rm-remove-mocha'Rafael Mendonça França2014-07-1920-84/+182
|\
| * Stop requiring mocha automaticallyRafael Mendonça França2014-07-1914-5/+19
| * Stop using mocha on dbconsole_testRafael Mendonça França2014-07-151-44/+68
| * Stop using mocha on console_testRafael Mendonça França2014-07-071-15/+40
| * Set the application logger using configurationRafael Mendonça França2014-07-071-3/+5
| * Stop using mocha on configuration_testRafael Mendonça França2014-07-071-7/+23
| * Stop using mocha on app_rails_loader_testRafael Mendonça França2014-07-072-10/+27
* | Merge pull request #16230 from egilburg/before_type_cast_coverageRafael Mendonça França2014-07-191-0/+7
|\ \
| * | adding missing test for text area value before type castEugene Gilburg2014-07-191-0/+7
|/ /
* | Merge pull request #16224 from egilburg/renderer_refactorsRafael Mendonça França2014-07-194-17/+32
|\ \
| * | adding missing test coverageEugene Gilburg2014-07-181-0/+12
| * | marking private methods which dont work if called on their own anywaysEugene Gilburg2014-07-182-1/+5
| * | small refactors to actionview renderersEugene Gilburg2014-07-183-16/+15
* | | Merge pull request #16227 from Aguynamedsteve/typo_correctionYves Senn2014-07-191-1/+1
|\ \ \
| * | | Fixed typo in commentSteve2014-07-191-1/+1