Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #18783 from mikestone14/actionview-image-tag-override | Rafael Mendonça França | 2015-05-03 | 2 | -0/+15 |
|\ | | | | | Actionview image tag size option override | ||||
| * | image_tag raises an error if size is passed with height and/or width | Mike Stone | 2015-04-24 | 2 | -0/+15 |
| | | |||||
* | | Merge pull request #17824 from ↵ | Rafael Mendonça França | 2015-05-03 | 4 | -5/+8 |
|\ \ | | | | | | | | | | | | | yuki24/change-record-not-saved-and-not-destroyed-to-include-error-msg AR::RecordNotSaved & RecordNotDestroyed from save!/destroy! should include an error message | ||||
| * | | AR::RecordNotSaved & RecordNotDestroyed should include an error message | Yuki Nishijima | 2015-05-01 | 4 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | | When `AR::Base.save!` or `AR::Base.destroy!` is called and an exception is raised, the exception doesn't have any error message or has a weird message like `#<FailedBulb:0x0000000907b4b8>`. Give a better message so we can easily understand why it's failing to save/destroy. | ||||
* | | | Merge pull request #17569 from kamipo/dump_table_options | Rafael Mendonça França | 2015-05-03 | 6 | -0/+106 |
|\ \ \ | | | | | | | | | | | | | Correctly dump `:options` on `create_table` for MySQL | ||||
| * | | | Correctly dump `:options` on `create_table` for MySQL | Ryuta Kamizono | 2015-05-03 | 6 | -0/+106 |
| | | | | |||||
* | | | | Merge pull request #19987 from kamipo/move_postgresql_specific_schema | Rafael Mendonça França | 2015-05-03 | 2 | -14/+11 |
|\ \ \ \ | | | | | | | | | | | Move PostgreSQL specific schema to postgresql_specific_schema.rb | ||||
| * | | | | Move PostgreSQL specific schema to postgresql_specific_schema.rb | Ryuta Kamizono | 2015-05-03 | 2 | -14/+11 |
| | | | | | |||||
* | | | | | Merge pull request #19978 from kamipo/collation_option_support_for_postgresql | Rafael Mendonça França | 2015-05-03 | 10 | -32/+116 |
|\ \ \ \ \ | | | | | | | | | | | | | PostgreSQL: `:collation` support for string and text columns | ||||
| * | | | | | PostgreSQL: `:collation` support for string and text columns | Ryuta Kamizono | 2015-05-04 | 4 | -3/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: create_table :foos do |t| t.string :string_en, collation: 'en_US.UTF-8' t.text :text_ja, collation: 'ja_JP.UTF-8' end | ||||
| * | | | | | Move the collation handling code from the MySQL adapter to common classes | Ryuta Kamizono | 2015-05-04 | 7 | -29/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some databases like MySQL allow defining collation charset for specific columns. | ||||
* | | | | | | Merge pull request #19980 from vngrs/use_new_lambda_syntax_in_doc | Rafael Mendonça França | 2015-05-03 | 4 | -7/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use ruby 1.9 lambda syntax in documentations [ci skip] | ||||
| * | | | | | | Use ruby 1.9 lambda syntax in documentations [ci skip] | Mehmet Emin İNAÇ | 2015-05-03 | 4 | -7/+7 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #19986 from tusharmaroo/my_first_contribution | Rafael Mendonça França | 2015-05-03 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Changed 'ask the rubyonrails-talk mailing list.' to 'ask it on the rubyo... | ||||
| * | | | | | | Changed 'ask the rubyonrails-talk mailing list.' to 'ask it on the ↵ | Tushar Maroo | 2015-05-03 | 1 | -1/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | rubyonrails-talk mailing list.' | ||||
* | | | | | | Merge pull request #19989 from kamipo/change_visit_addcolumn_visibilty | Rafael Mendonça França | 2015-05-03 | 3 | -11/+14 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Change the `visit_AddColumn` visiblity for the internal API | ||||
| * | | | | | | Change the `visit_AddColumn` visiblity for the internal API | Ryuta Kamizono | 2015-05-03 | 3 | -11/+14 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Do not use named queues for que adapter | Rafael Mendonça França | 2015-05-03 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | See #19498 | ||||
* | | | | | | Disable warnings on activejob tests | Rafael Mendonça França | 2015-05-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementations seems to not be interested to remove the warnings so enabling them we are just making harder to read the outputs | ||||
* | | | | | | Merge pull request #19972 from ↵ | Rafael Mendonça França | 2015-05-03 | 1 | -0/+14 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | robertjlooby/document_habtm_changes_in_upgrade_guide add upgrade note for breaking habtm change in 3.2 -> 4.0 | ||||
| * | | | | | | add note about habtm relations with scopes | Rob Looby | 2015-05-03 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | add upgrade note for breaking habtm change in 3.2 -> 4.0 | Rob Looby | 2015-05-01 | 1 | -0/+12 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The has_and_belongs_to_many default join_table behavior changed between Rails 3.2 and Rails 4.0 and should be noted in the appropriate section of the upgrade guide. commit: https://github.com/rails/rails/commit/46492949b8c09f99db78b9f7a02d039e7bc6a702 | ||||
* | | | | | | Merge pull request #19498 from chanks/activejob-que-remove-named-queues | Rafael Mendonça França | 2015-05-03 | 2 | -3/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | ActiveJob: Stop using Que's named queues. | ||||
| * | | | | | | Stop using Que's named queues in its ActiveJob adapter. | Chris Hanks | 2015-03-24 | 2 | -3/+7 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #19999 from kamipo/missing_bigint | Rafael Mendonça França | 2015-05-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Missing `:bigint` [ci skip] | ||||
| * | | | | | | Missing `:bigint` [ci skip] | Ryuta Kamizono | 2015-05-04 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #19988 from kamipo/move_comment_about_microseconds | Zachary Scott | 2015-05-03 | 2 | -2/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Move comment about microseconds [ci skip] | ||||
| * | | | | | | Move comment about microseconds [ci skip] | Ryuta Kamizono | 2015-05-03 | 2 | -2/+3 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | The microseconds handling was already moved to `Quoting#quoted_date`. | ||||
* | | | | | | Merge pull request #19990 from kamipo/mysql2-0.3.18 | Santiago Pastorino | 2015-05-03 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | gem 'mysql2', '~> 0.3.18' | ||||
| * | | | | | | gem 'mysql2', '~> 0.3.18' | Ryuta Kamizono | 2015-05-04 | 1 | -1/+1 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Follow up #18914. | ||||
* | | | | | | Merge pull request #19991 from mcfiredrill/nodoc-postgresql-change-column | Richard Schneeman | 2015-05-03 | 1 | -2/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | `:nodoc:` postgresql's change_column | ||||
| * | | | | | `:nodoc:` postgresql's change_column | Tony Miller | 2015-05-03 | 1 | -2/+1 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | Its nodoc'ed for the other implementations, and doc'ed in the base class, just like the other change_column* methods. | ||||
* | | | | | Merge pull request #19982 from acapilleri/scope_uniquiness | Yves Senn | 2015-05-03 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | [ci skip] Uniquiness with scope can have one or more arguments | ||||
| * | | | | | [ci skip] Uniquiness with scope can have one or more arguments | Angelo Capilleri | 2015-05-03 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #19984 from mcfiredrill/nodoc-change-column-null | Yves Senn | 2015-05-03 | 3 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | :nodoc: change_column_null in the implmenting adapters | ||||
| * | | | | | :nodoc: change_column_null in the implmenting adapters | Tony Miller | 2015-05-03 | 3 | -3/+3 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | `change_column_null` is doc'ed only in ActiveRecord::ConnectionAdapters::SchemaStatements, so it would make sense to :nodoc: it elsewhere. | ||||
* | | | | | Merge pull request #19983 from kamipo/remove_unused_require | Yves Senn | 2015-05-03 | 2 | -2/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | Remove unused require | ||||
| * | | | | Remove unused require | Ryuta Kamizono | 2015-05-03 | 2 | -2/+0 |
|/ / / / | |||||
* | | | | Use `def before_setup` instead of `setup do` | eileencodes | 2015-05-02 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `setup do` creates unnecessary allocations of proc objects in test callbacks. This prevents that from happening and results in faster code. Originally I had done this as `def setup` and all Railties tests passed. See 044f9ab. Later it was reported there was an issue with this that caused routes in tests to be nil because devs don't generally call `super` in their test setups. Because of that I reverted the commit until I could find a suitble replacement. `before_setup` esentially does the same thing but without the requirement that applications call `super` in their test setups. | ||||
* | | | | Use `args` instead of `*args` in `kwargs_request?` method | eileencodes | 2015-05-02 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | `*args` is not required here and should be avoided when not necessary because `*args` are slower than `args` and create unnecessary array allocations. | ||||
* | | | | Fix method call typo [ci skip] | Zachary Scott | 2015-05-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #19973 from trosborn/master | Zachary Scott | 2015-05-02 | 1 | -46/+39 |
|\ \ \ \ | | | | | | | | | | | Clean up debugging guide and fix minor grammatical errors[ci skip] | ||||
| * | | | | Clean up debugging guide and fix minor grammatical errors[ci skip] | Thomas Osborn | 2015-05-01 | 1 | -46/+39 |
| |/ / / | |||||
* | | | | Merge pull request #19974 from yui-knk/fix/form_for_examples_2 | Zachary Scott | 2015-05-02 | 1 | -26/+36 |
|\ \ \ \ | | | | | | | | | | | [ci skip] Fix example codes of form_for method | ||||
| * | | | | [ci skip] Fix example codes of form_for method | yui-knk | 2015-05-02 | 1 | -26/+36 |
| |/ / / | |||||
* | | | | Merge pull request #19975 from prathamesh-sonpatki/engine-minor-changes | Zachary Scott | 2015-05-01 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | Added missing fullstop in engine API docs [ci skip] | ||||
| * | | | Added missing fullstop in engine API docs [ci skip] | Prathamesh Sonpatki | 2015-05-02 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #19971 from thiagoaugusto/improve-activerecord-changelog | Yves Senn | 2015-05-01 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Improvement on Activerecord CHANGELOG.md [ci skip] | ||||
| * | | | | Improvement on Activerecord CHANGELOG | thiagoaugusto | 2015-05-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #19970 from robertomiranda/patch-3 | Kasper Timm Hansen | 2015-05-01 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Update documentation to contain a 24 char token [ci skip] |