aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #18890 from kamipo/remove_cast_typeYves Senn2015-02-111-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove `cast_type` in `ColumnDefinition`
| * | | | | | | Remove `cast_type` in `ColumnDefinition`Ryuta Kamizono2015-02-111-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | This is no longer needed.
* | | | | | | guides, various testing guide changes. [ci skip]Yves Senn2015-02-111-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | /cc @zzak
* | | | | | | Merge pull request #18363 from ↵Yves Senn2015-02-111-0/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | andreynering/add-foreign-key-subsection-in-upgrading-guide Adding subsection on 'Upgrading' guide about foreign key support [ci skip]
| * | | | | | | 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]
| * | | | | | | | 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_railties documentation [ci-skip]
| * | | | | | | | 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`
| * | | | | | | Use keyword argument in `transaction`Ryuta Kamizono2015-02-111-6/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The keys are already validated, so it is better to use the built-in feature to do this.
* | | | | | | Merge pull request #18884 from rails/fix-kwarg-on-staleRafael Mendonça França2015-02-102-1/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fix wrong kwarg "record" from #18872
| * | | | | | Fix wrong kwarg "record" from #18872claudiob2015-02-102-1/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #18772 changed the parameters of `stale?` to use `kwargs`. [As for this comment](https://github.com/rails/rails/pull/18872/files#r24456288) the default value for the `etag` parameter should be `record`, not `nil`. This commit fixes the code and introduces a test that: - passed before #18872 - fails on the current master (after #18772) - passes again after setting the default value of `etag` to `record`.
* | | | | | 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.
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Like for real this time. I checked.
* | | | | | 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]
| * | | | | | 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` to `find_in_batches`
| * | | | | | | Add an option `end_at` to `find_in_batches`Vipul A M2015-02-094-13/+50
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | that complements the `start`parameter to specify where to stop batch processing
* | | | | | | Fix the buildSean Griffin2015-02-101-1/+1
| |/ / / / / |/| | | | |
* | | | | | Refactor microsecond precision to be database agnosticSean Griffin2015-02-1011-84/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The various databases don't actually need significantly different handling for this behavior, and they can achieve it without knowing about the type of the object. The old implementation was returning a string, which will cause problems such as breaking TZ aware attributes, and making it impossible for the adapters to supply their logic for time objects.
* | | | | | Merge pull request #18860 from ↵Rafael Mendonça França2015-02-101-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | alex-handley/enhancement/dependent_documentation_fix Documentation Fix: Corrects explanation of what happens when dependent is not set
| * | | | | | [ci skip] corrects documentation for the default dependent behaviourAlex Handley2015-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default the foreign key will remain set with the parent id after destroy is fired.
* | | | | | | Maintain a consistent order in `ActiveRecord::Base#attributes`Sean Griffin2015-02-102-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18871
* | | | | | | Merge pull request #18808 from carlosramireziii/i18n-doc-updateRobin Dupret2015-02-101-0/+19
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Document lazy lookup behavior for controllers [ci skip]
| * | | | | | Document lazy lookup behavior for controllersCarlos Ramirez III2015-02-031-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull request #7082 added lazy lookup to controllers using the translate method, but the documentation still stated that it was available for views only. [ci skip]
* | | | | | | Change `LockingType` to use `DelegateClass`Sean Griffin2015-02-091-1/+1
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | Significantly faster than `SimpleDelegator`.
* | | | | | 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::Translator
| * | | | | | Remove warning from ActionView::Helpers::Tags::TranslatorYuki Nishijima2015-02-081-1/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the following warning: /GitHub/rails/actionview/lib/action_view/helpers/tags/translator.rb:19: warning: private attribute?
* | | | | | 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`
| * | | | | An array type is a part of `sql_type`Ryuta Kamizono2015-02-082-19/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `sql_type` is reused in `lookup_cast_type`. If making it a part of `sql_type` when handled array option first, it isn't necessary to do again.
* | | | | | tests, reset global to previous value.Yves Senn2015-02-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default of the global might change. It's better to reset it to what it was than a hardcoded value.
* | | | | | Merge pull request #18839 from ↵Yves Senn2015-02-091-10/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | yuki24/remove-warning-from-generators-named-base-test Remove warning from generator named base test
| * | | | | | Remove warning from generator named base testYuki Nishijima2015-02-081-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the following warning: railties/test/generators/named_base_test.rb:9: warning: method redefined; discarding old pluralize_table_names activesupport/lib/active_support/core_ext/class/attribute.rb:86: warning: previous definition of pluralize_table_names was here railties/test/generators/named_base_test.rb:9: warning: method redefined; discarding old pluralize_table_names= activesupport/lib/active_support/core_ext/class/attribute.rb:83: warning: previous definition of pluralize_table_names= was here
* | | | | | | Merge pull request #18840 from yuki24/remove-warning-from-plugin-generatorYves Senn2015-02-091-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Remove warning from Plugin Generator
| * | | | | | Remove warning from Plugin GeneratorYuki Nishijima2015-02-081-3/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the following warning: rails/railties/lib/rails/generators/rails/plugin/plugin_generator.rb:321: warning: shadowing outer local variable - content
* | | | | | Merge pull request #18764 from tsun1215/masterAndrew White2015-02-083-0/+33
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Explicitly ignored wildcard verbs from head_routes
| * | | | | Explicitly ignored wildcard verbs from head_routesTerence Sun2015-02-083-0/+33
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | In match_head_routes, deleted the routes in which request.request_method was empty (matches all HTTP verbs) when responding to a HEAD request. This prevents catch-all routes (such as Racks) from intercepting the HEAD request. Fixes #18698
* | | | | 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
| | | | | | | | | | | | | | | | | | | | Added by 101c19f55f5f1d86d35574b805278f11e9a1a48e.
* | | | | Merge pull request #18850 from ↵Andrew White2015-02-085-19/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/fix_rounding_problem_for_postgresql_timestamp_column Fix rounding problem for PostgreSQL timestamp column
| * | | | | Fix rounding problem for PostgreSQL timestamp columnRyuta Kamizono2015-02-085-19/+50
|/ / / / / | | | | | | | | | | | | | | | | | | | | If timestamp column have the precision, it need to format according to the precision of timestamp column.
* | | | | 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.
| * | | | | Respect the database default charset for `schema_migrations` table.Ryuta Kamizono2015-02-083-5/+21
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | The charset of `version` column in `schema_migrations` table is depend on the database default charset and collation rather than the encoding of the connection.
* | | | | Merge pull request #18848 from kamipo/add_auto_increment_methodAndrew White2015-02-082-3/+7
|\ \ \ \ \ | | | | | | | | | | | | Add `auto_increment?` instead of `extra == 'auto_increment'`
| * | | | | 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 line
| * | | | | Remove unused lineRyuta Kamizono2015-02-081-1/+0
| |/ / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 13:55:43 +0000