aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #18374 from claudiob/add-collection-to-fresh-whenRafael Mendonça França2015-02-113-11/+103
|\ \ \ \ \ \ \
| * | | | | | | Accept a collection in fresh_when and stale?claudiob2015-02-103-11/+103
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #18845 from bogdan/remove-code-dups-in-action-viewRafael Mendonça França2015-02-112-33/+25
|\ \ \ \ \ \ \
| * | | | | | | Remove code duplication in ActionView::Helpers::Tags::BaseBogdan Gusiev2015-02-112-33/+25
* | | | | | | | Revert 88d08f2ec9f89ba431cba8d0c06ac9ebc204bbbbRafael Mendonça França2015-02-112-13/+25
| |_|/ / / / / |/| | | | | |
* | | | | | | Remove the SQLite3 Binary subclassSean Griffin2015-02-112-28/+0
* | | | | | | Reduce object allocations in ActiveSupport::Subscribereileencodes2015-02-111-1/+1
* | | | | | | Remove an unused option that I didn't mean to commit [ci skip]Sean Griffin2015-02-111-2/+1
* | | | | | | Remove most PG specific type subclassesSean Griffin2015-02-1114-91/+60
* | | | | | | Merge pull request #18883 from kamipo/fix_datetime_precision_dumping_zero_for...Sean Griffin2015-02-113-23/+46
|\ \ \ \ \ \ \
| * | | | | | | The datetime precision with zero should be dumpedRyuta Kamizono2015-02-113-23/+46
* | | | | | | | prefer `drop_table :table, if_exists: true` over explicit checks.Yves Senn2015-02-111-2/+2
* | | | | | | | add test to ensure `remove_reference` with index and fk is invertable.Yves Senn2015-02-111-0/+5
* | | | | | | | fix `remove_reference` with `foreign_key: true` on MySQL. #18664.Yves Senn2015-02-113-0/+24
* | | | | | | | Merge pull request #18890 from kamipo/remove_cast_typeYves Senn2015-02-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove `cast_type` in `ColumnDefinition`Ryuta Kamizono2015-02-111-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | guides, various testing guide changes. [ci skip]Yves Senn2015-02-111-7/+15
* | | | | | | | Merge pull request #18363 from andreynering/add-foreign-key-subsection-in-upg...Yves Senn2015-02-111-0/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Adding subsection on 'upgrading' guide about 4.2 foreign key support [ci skip]Andrey Nering2015-02-101-0/+14
* | | | | | | | | Merge pull request #18892 from robertzk/typo_in_rails_engine_rbZachary Scott2015-02-101-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix some typos in railties/lib/rails/engine.rb [ci-skip]RobertZK2015-02-101-4/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #18891 from robertzk/typo_in_rails_application_rbArthur Nogueira Neves2015-02-101-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix typo in Rails::Application#migration_railtiesRobertZK2015-02-101-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #18889 from kamipo/use_kwargs_in_transactionRafael Mendonça França2015-02-111-6/+4
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Use keyword argument in `transaction`Ryuta Kamizono2015-02-111-6/+4
|/ / / / / / / /
* | | | | | | | Merge pull request #18884 from rails/fix-kwarg-on-staleRafael Mendonça França2015-02-102-1/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix wrong kwarg "record" from #18872claudiob2015-02-102-1/+2
|/ / / / / / /
* | | | | | | Merge pull request #18872 from kaspth/kw-fresh_when-staleArthur Nogueira Neves2015-02-101-12/+10
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Convert stale? and fresh_when to use keyword arguments.Kasper Timm Hansen2015-02-101-12/+10
* | | | | | | Dont check bundler output on plugin generator testArthur Neves2015-02-101-4/+2
* | | | | | | Actually fix the buildSean Griffin2015-02-101-1/+1
* | | | | | | Merge pull request #18877 from prathamesh-sonpatki/ar-changelog-typos-2Rafael Mendonça França2015-02-101-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fixed typos in ActiveRecord CHANGELOG [ci skip]Prathamesh Sonpatki2015-02-111-2/+2
* | | | | | | | Merge pull request #12257 from vipulnsward/end_on_find_in_batchesRafael Mendonça França2015-02-104-13/+50
|\ \ \ \ \ \ \ \
| * | | | | | | | Add an option `end_at` to `find_in_batches`Vipul A M2015-02-094-13/+50
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Fix the buildSean Griffin2015-02-101-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Refactor microsecond precision to be database agnosticSean Griffin2015-02-1011-84/+55
* | | | | | | Merge pull request #18860 from alex-handley/enhancement/dependent_documentati...Rafael Mendonça França2015-02-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] corrects documentation for the default dependent behaviourAlex Handley2015-02-091-1/+1
* | | | | | | | Maintain a consistent order in `ActiveRecord::Base#attributes`Sean Griffin2015-02-102-1/+21
* | | | | | | | Merge pull request #18808 from carlosramireziii/i18n-doc-updateRobin Dupret2015-02-101-0/+19
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Document lazy lookup behavior for controllersCarlos Ramirez III2015-02-031-0/+19
* | | | | | | | Change `LockingType` to use `DelegateClass`Sean Griffin2015-02-091-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #18841 from yuki24/remove-warning-from-av-tags-translatorRafael Mendonça França2015-02-091-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Remove warning from ActionView::Helpers::Tags::TranslatorYuki Nishijima2015-02-081-1/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #18849 from kamipo/array_type_is_a_part_of_sql_typeSean Griffin2015-02-092-19/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | An array type is a part of `sql_type`Ryuta Kamizono2015-02-082-19/+4
* | | | | | | tests, reset global to previous value.Yves Senn2015-02-091-1/+3
* | | | | | | Merge pull request #18839 from yuki24/remove-warning-from-generators-named-ba...Yves Senn2015-02-091-10/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove warning from generator named base testYuki Nishijima2015-02-081-10/+0