aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* rename MiniTest to MinitestRajarshi Das2014-08-022-3/+3
* Fix that render layout should also be picked up by the template dependency tr...David Heinemeier Hansson2014-07-253-4/+29
* Merge pull request #16290 from a3gis/masterZachary Scott2014-07-252-2/+2
|\
| * Remove references to SQLite3Column from documentationa3gis2014-07-251-1/+1
| * Fix documentation of SQlite3Adapter.columnsa3gis2014-07-251-1/+1
* | Merge pull request #16285 from noinkling/password_digest_docsRafael Mendonça França2014-07-252-2/+18
|\ \
| * | Additional clarification on password:digest in scaffold and model generator h...noinkling2014-07-252-4/+16
| * | Add password:digest information to scaffold generator help text [ci skip]noinkling2014-07-251-1/+5
* | | docs, add ref where to find valid `head` status symbols.Yves Senn2014-07-251-0/+2
* | | Merge pull request #16258 from mattwarrenrnp/masterYves Senn2014-07-251-11/+20
|\ \ \
| * | | adding indexes on tables in migration scriptsMatt Warren2014-07-241-11/+20
* | | | Merge pull request #16220 from pcreux/postgresql-jsonb-supportYves Senn2014-07-256-9/+64
|\ \ \ \
| * | | | Add support for Postgresql JSONBPhilippe Creux2014-07-246-9/+64
| | |/ / | |/| |
* | | | Merge pull request #16272 from tgxworld/fix_template_assertion_when_opening_a...Matthew Draper2014-07-252-9/+53
|\ \ \ \ | |/ / / |/| | |
| * | | Improve description of tests.Guo Xiang Tan2014-07-251-4/+4
| * | | Bug fix for assert_template when opening a new session.Guo Xiang Tan2014-07-252-5/+49
* | | | Merge pull request #16281 from arthurnn/copy_default_proc_hwiaSantiago Pastorino2014-07-243-0/+16
|\ \ \ \
| * | | | Make HWIA copy the default proc too.Arthur Neves2014-07-243-0/+16
|/ / / /
* | | | tests, run adapter specific rake tests only for the right adapter.Yves Senn2014-07-243-0/+6
* | | | build fix, fix error introduced with 091b246bb0111357edbb9703ea342a944b04deb6Yves Senn2014-07-241-2/+2
* | | | fix, mysql `db:purge` respects `Rails.env`.Yves Senn2014-07-242-1/+5
* | | | clenaup, unify CHANGELOG format. [ci skip]Yves Senn2014-07-241-5/+7
* | | | Merge pull request #16280 from a3gis/masterMatthew Draper2014-07-241-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix documentation typo in ConnectionSpecification::Resolve.speca3gis2014-07-241-1/+1
| * | | Fixes #16265a3gis2014-07-241-1/+1
* | | | pg, `change_column_default, :table, :column, nil` issues `DROP DEFAULT`.Yves Senn2014-07-242-1/+16
* | | | Merge pull request #16276 from y-yagi/bug_report_templatesMatthew Draper2014-07-242-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip]Add i18n master to the Gemfileyuuji.yaginuma2014-07-242-0/+2
| |/ /
* | | Merge pull request #16260 from akshay-vishnoi/doc-changeMatthew Draper2014-07-241-2/+1
|\ \ \ | |/ / |/| |
| * | Calling require_self twice in css raises Sprockets::ArgumentError exception [...Akshay Vishnoi2014-07-241-2/+1
* | | Remove mocha usageRafael Mendonça França2014-07-231-2/+5
* | | Fix syntax errorRafael Mendonça França2014-07-231-1/+2
* | | 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
|\ \ \ | |/ / |/| |