aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | Merge pull request #18840 from yuki24/remove-warning-from-plugin-generatorYves Senn2015-02-091-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove warning from Plugin GeneratorYuki Nishijima2015-02-081-3/+3
| | |/ / | |/| |
* | | | Merge pull request #18764 from tsun1215/masterAndrew White2015-02-083-0/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Explicitly ignored wildcard verbs from head_routesTerence Sun2015-02-083-0/+33
|/ / /
* | | Move #18833 changelog to the top [ci skip]Carlos Antonio da Silva2015-02-081-35/+33
* | | Remove debug codeCarlos Antonio da Silva2015-02-081-5/+0
* | | Merge pull request #18850 from kamipo/fix_rounding_problem_for_postgresql_tim...Andrew White2015-02-085-19/+50
|\ \ \
| * | | Fix rounding problem for PostgreSQL timestamp columnRyuta Kamizono2015-02-085-19/+50
|/ / /
* | | Merge pull request #18602 from kamipo/respect_database_charset_and_collationAndrew White2015-02-083-5/+21
|\ \ \
| * | | Respect the database default charset for `schema_migrations` table.Ryuta Kamizono2015-02-083-5/+21
| |/ /
* | | Merge pull request #18848 from kamipo/add_auto_increment_methodAndrew White2015-02-082-3/+7
|\ \ \
| * | | Add `auto_increment?` instead of `extra == 'auto_increment'`Ryuta Kamizono2015-02-082-3/+7
| |/ /
* | | Merge pull request #18851 from kamipo/remove_unused_lineAndrew White2015-02-081-1/+0
|\ \ \
| * | | Remove unused lineRyuta Kamizono2015-02-081-1/+0
| |/ /
* | | Merge pull request #18852 from kamipo/missing_atAbdelkader Boudih2015-02-081-1/+1
|\ \ \ | |/ / |/| |
| * | Missing `@` [ci skip]Ryuta Kamizono2015-02-081-1/+1
|/ /
* | rm `Type#number?`Sean Griffin2015-02-0717-29/+1