aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21703 from ronakjangir47/redirect_error_messagesJeremy Daer2015-09-211-2/+4
|\
| * Added assertion for error messages for redirection to nil and params Ronak Jangir2015-09-211-2/+4
* | drop array allocations on Mime::Type#=~Aaron Patterson2015-09-211-3/+1
* | remove another `blank?` callAaron Patterson2015-09-211-1/+1
* | remove html_types setAaron Patterson2015-09-212-7/+3
* | compare arrays not set objects.Aaron Patterson2015-09-211-3/+3
* | introduce an `All` mime typeAaron Patterson2015-09-213-3/+11
* | remove `blank?` calls on `==`Aaron Patterson2015-09-211-1/+1
* | change inheritance to compositionAaron Patterson2015-09-212-16/+27
* | update changelog for mime changesAaron Patterson2015-09-211-0/+13
* | swap upcase and to_symAaron Patterson2015-09-211-1/+1
* | stop calling deprecated methodsAaron Patterson2015-09-2122-93/+93
* | deprecate accessing mime types via constantsAaron Patterson2015-09-214-42/+92
* | cache the new type object on the stackAaron Patterson2015-09-211-2/+2
* | Merge pull request #21704 from ronakjangir47/eliminate_testsAndrew White2015-09-211-8/+0
|\ \
| * | Eliminate `test_tables_quoting` following seems to be left in #21687Ronak Jangir2015-09-211-8/+0
|/ /
* | Skip the test added in 9cc324a on buggy versions of SQliteSean Griffin2015-09-212-17/+22
* | Ensure aliased attributes passed to `select` are quoted if using `from`Sean Griffin2015-09-214-1/+21
* | Fix another implicit dependency of the AM test suiteSean Griffin2015-09-211-0/+1
* | Require dependencies from stdlib in the Decimal typeSean Griffin2015-09-211-0/+2
* | We still need the `Helpers` constant in the `ActiveRecord` namespaceSean Griffin2015-09-211-0/+1
* | Remove no-op options being passed in AM type registrationsSean Griffin2015-09-211-11/+11
|/
* Merge pull request #21533Sean Griffin2015-09-2142-426/+655
|\
| * Move the appropriate type tests to the Active Model suiteSean Griffin2015-09-219-225/+263
| * Simplify the implementation of Active Model's type registrySean Griffin2015-09-213-103/+60
| * Various stylistic nitpicksSean Griffin2015-09-217-46/+43
| * `TypeMap` and `HashLookupTypeMap` shouldn't be in Active ModelSean Griffin2015-09-214-8/+5
| * Move ActiveRecord::Type to ActiveModelKir Shatrov2015-09-2131-96/+336
|/
* Merge pull request #21612 from ronakjangir47/remove_unused_paramsSean Griffin2015-09-211-2/+2
|\
| * Removed unused parameter `options` for `register_detail` methodRonak Jangir2015-09-131-2/+2
* | Update to latest turbolinksAndrew White2015-09-211-1/+1
* | Use Sidekiq.options to set initial waitAndrew White2015-09-211-1/+1
* | Run `rake db:migrate` for all Active Job integration testsAndrew White2015-09-211-1/+2
* | Silence logging in Active Job unit testsAndrew White2015-09-211-0/+1
* | Use master version of Turbolinks gemAndrew White2015-09-212-4/+10
* | Short-circuit `blank?` on date and time valuesAndrew White2015-09-217-1/+48
* | Merge pull request #21684 from amitsuroliya/correct_resultAndrew White2015-09-211-6/+4
|\ \
| * | Applying right result of examples in ActiveSupport Multibyte [ci skip]amitkumarsuroliya2015-09-211-6/+4
* | | Merge pull request #21693 from joshuapinter/patch-1Jeremy Daer2015-09-201-0/+2
|\ \ \
| * | | Add title for key lengths for multiple keys.Joshua Pinter2015-09-201-0/+2
* | | | Merge pull request #21694 from harrykiselev/patch-2Jeremy Daer2015-09-201-0/+1
|\ \ \ \
| * | | | Update routing.rbHarry V. Kiselev2015-09-201-0/+1
* | | | | Merge pull request #20009 from kamipo/foreign_keys_in_createJeremy Daer2015-09-203-17/+33
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Support for foreign keys in create tableRyuta Kamizono2015-09-203-17/+33
| | |/ / | |/| |
* | | | Merge pull request #21687 from kamipo/refactor_table_existsAndrew White2015-09-203-27/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | Refactor `table_exists?` in AbstractMysqlAdapterRyuta Kamizono2015-09-203-27/+10
| |/ /
* | | :hocho: TyposAkira Matsuda2015-09-216-6/+6
* | | TypppoAkira Matsuda2015-09-211-3/+3
* | | :scissors: empty line at the top of filesAkira Matsuda2015-09-219-9/+0
* | | Merge pull request #21689 from y-yagi/fix_application_controller_require_depe...Andrew White2015-09-202-1/+2
|\ \ \