aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21356 from ronakjangir47/remove_mocha_railtiesKasper Timm Hansen2015-09-222-15/+35
|\
| * Removed mocha from Railites PluginGeneratorTestRonak Jangir2015-09-222-15/+35
* | tests, use `if_exists: true` instead of `rescue nil`.Yves Senn2015-09-221-1/+1
* | AMo typosAkira Matsuda2015-09-222-3/+3
|/
* Merge pull request #21714 from thiagoaugusto/patch-2Richard Schneeman2015-09-221-2/+2
|\
| * Update routing.mdThiago Augusto2015-09-221-2/+2
|/
* fix `bin/test -a sqlite3_mem`.Yves Senn2015-09-221-19/+13
* Merge pull request #20569 from theSteveMitchell/masterYves Senn2015-09-223-15/+31
|\
| * Check response of structure_load for mysql_database_tasks and make structure_...Steve Mitchell2015-09-182-12/+35
* | Merge pull request #21712 from amitsuroliya/html_fixYves Senn2015-09-221-2/+2
|\ \
| * | Correcting output of `file_field` with `multiple` attribute option [ci skip]amitkumarsuroliya2015-09-221-2/+2
* | | Merge pull request #21678 from ronakjangir47/array_to_formatted_s_docsYves Senn2015-09-221-1/+3
|\ \ \
| * | | Added Examples in docs for internal behavior of Array#to_formatted_s [ci skip]Ronak Jangir2015-09-191-1/+3
* | | | Merge pull request #21710 from amitsuroliya/correct_resultClaudio B.2015-09-212-2/+2
|\ \ \ \
| * | | | Correcting output of `number_to_percentage` example in `number_helper` [ci skip]amitkumarsuroliya2015-09-222-2/+2
| | |/ / | |/| |
* | | | Merge pull request #21711 from JuanitoFatas/doc/typo-1Robin Dupret2015-09-221-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix a typo: Mime::Types should be Mime::Type [ci skip]Juanito Fatas2015-09-221-1/+1
|/ / /
* | | 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