aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Follow-up to #10776Robin Dupret2015-02-2611-24/+30
| | | | | | | | | | The name `ActiveModel::AttributeAssignment::UnknownAttributeError` is too implementation specific so let's move the constant directly under the ActiveModel namespace. Also since this constant used to be under the ActiveRecord namespace, to make the upgrade path easier, let's avoid raising the former constant when we deal with this error on the Active Record side.
* Tiny documentation edits [ci skip]Robin Dupret2015-02-243-5/+4
|
* Call `attributes_for_update` in `_update_record` w/ optimistic lockingSean Griffin2015-02-241-1/+1
| | | | Fixes #19057
* Fix c479480638508c20601af69ca46b5b606c2d5b4d to account for from_value -> ↵Jeremy Kemper2015-02-241-1/+1
| | | | from_clause in bdc5141652770fd227455681cde1f9899f55b0b9
* Merge pull request #18744 from mfazekas/no-table-name-with-fromRafael Mendonça França2015-02-242-5/+20
| | | | Fix appending table_name to select and group when used with subquery (fr...
* Merge pull request #19066 from courtenay/mysql_boolean_limit_19065Rafael Mendonça França2015-02-242-0/+6
|\ | | | | Fix mysql's schema.rb dumper so it does not include limit on emulated booleans
| * Fix mysql's schema.rb dumper so it does not include limit on emulated ↵Court3nay2015-02-242-0/+6
|/ | | | boolean tinyint(1) fields
* Merge pull request #19055 from ianks/model_name.to_jsonRafael Mendonça França2015-02-242-1/+5
|\ | | | | activemodel: make .model_name json encodable
| * activemodel: make .model_name json encodableIan Ker-Seymer2015-02-242-1/+5
| | | | | | | | | | | | Previously, calling `User.model_name.to_json` would result in an infinite recursion as `.model_name` inherited its `.as_json` behavior from Object. This patch fixes that unexpected behavior by delegating `.as_json` to :name.
* | Use other controller instead of sharing the controllerRafael Mendonça França2015-02-241-18/+17
|/
* Make TestController available to all test classesRafael Mendonça França2015-02-241-16/+16
|
* Merge pull request #19060 from iainbeeston/deprecate-skip-action-callbackRafael Mendonça França2015-02-243-2/+28
|\ | | | | Deprecate `AbstractController::Callbacks#skip_action_callback`
| * Deprecate `AbstractController::Callbacks#skip_action_callback`Iain Beeston2015-02-243-2/+28
| | | | | | | | | | | | | | | | | | | | As part of #19029, in future `skip_before_action`, `skip_after_action` and `skip_around_action` will raise an ArgumentError if the specified callback does not exist. `skip_action_callback` calls all three of these methods and will almost certainly result in an ArgumentError. If anyone wants to remove all three callbacks then they can still call the three individual methods. Therefore let's deprecate `skip_action_callback` now and remove it when #19029 is merged.
* | rework `disable_referential_integrity` for PostgreSQL.Yves Senn2015-02-243-9/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Toby Ovod-Everett & Andrey Nering & Yves Senn] Closes #17726. Closes #10939. This patch makes three distinct modifications: 1. no longer fall back to disabling user triggers if system triggers can't be disabled 2. warn the user when referential integrity can't be disabled 3. restore aborted transactions when referential integrity can't be disabled The motivation behind these changes is to make the behavior of Rails transparent and less error-prone. To require superuser privileges is not optimal but it's what Rails currently needs. Users who absolutely rely on disabling user triggers can patch `disable_referential_integrity`. We should investigate `SET CONSTRAINTS` as a possible solution which does not require superuser privileges. /cc @matthewd
* | Merge pull request #19064 from kamipo/remove_unused_tableRafael Mendonça França2015-02-241-10/+0
|\ \ | | | | | | Remove unused table
| * | Remove unused tableRyuta Kamizono2015-02-251-10/+0
| | | | | | | | | | | | `postgresql_xml_data_type` table is used from nowhere.
* | | Merge pull request #19062 from ↵Rafael Mendonça França2015-02-241-4/+4
|\ \ \ | |/ / |/| | | | | | | | kamipo/move_back_new_column_definition_into_table_definition Move back `new_column_definition` into `TableDefinition`
| * | Move back `new_column_definition` into `TableDefinition`Ryuta Kamizono2015-02-251-4/+4
|/ / | | | | | | | | | | | | | | | | Only `primary_key` should be extracted by d47357e in #19030, but `new_coclumn_definition` was also extracted because #17631 is merged previously, then #19030 is auto merged without conflicts. This commit is for move back `new_column_definition` into `TableDefinition`.
* | Avoid creating an extra hash on the job test adapterCarlos Antonio da Silva2015-02-241-1/+1
| |
* | Merge pull request #19052 from square/testing-singletonRafael Mendonça França2015-02-234-31/+31
|\ \ | | | | | | `ActiveJob::QueueAdapters::TestAdapter` is now a singleton
| * | `ActiveJob::QueueAdapters::TestAdapter` is now a singletonTamir Duberstein2015-02-234-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since `ActiveJob::TestHelper` globally sets `ActiveJob::Base.queue_adapter` on setup, there is no benefit in instantiating a new `TestAdapter` per tests. The original rationale was to allow parallel tests to run without interference, but since they'd all mutate the global `ActiveJob::Base.queue_adapter`, that was never realized.
* | | Merge pull request #19030 from kamipo/extract_short_hand_column_methodsRafael Mendonça França2015-02-234-110/+173
|\ \ \ | |/ / |/| | Extract the short-hand column methods into `ColumnMethods`
| * | The short-hand methods should be able to define multiple columnsRyuta Kamizono2015-02-232-45/+69
| | |
| * | Extract the short-hand methods into `ColumnMethods`Ryuta Kamizono2015-02-232-23/+36
| | |
| * | Extract `primary_key` method into `ColumnMethods`Ryuta Kamizono2015-02-224-42/+68
| | |
* | | Merge pull request #19038 from tchandy/cleaning_actionpack_testsSantiago Pastorino2015-02-234-41/+3
|\ \ \ | | | | | | | | Cleaning actionpack tests
| * | | Removing old helper that was necessary for compatibility with Ruby 1.8.xThiago Pradi2015-02-223-18/+3
| | | |
| * | | Removing unused constants from abstract_unitThiago Pradi2015-02-221-2/+0
| | | |
| * | | Removing unused controller from abstract_unitThiago Pradi2015-02-221-16/+0
| | | |
| * | | Removing unused templateThiago Pradi2015-02-221-5/+0
| |/ /
* | | Merge pull request #17631 from kamipo/bigint_pk_supportRafael Mendonça França2015-02-233-0/+35
|\ \ \ | | | | | | | | Allow limit option for MySQL bigint primary key support.
| * | | Allow `:limit` option for MySQL bigint primary key supportRyuta Kamizono2015-02-243-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: create_table :foos, id: :primary_key, limit: 8 do |t| end # or create_table :foos, id: false do |t| t.column :id, limit: 8 end
* | | | Merge pull request #19048 from girasquid/patch-1Abdelkader Boudih2015-02-231-1/+1
|\ \ \ \ | |/ / / |/| | | Fix typo
| * | | Fix typo [ci skip]Luke Hutscal2015-02-231-1/+1
|/ / / | | | | | | | | | I think this was supposed to be "roundTrip".
* | | some indenting and punctuation fixes. [ci skip]Yves Senn2015-02-234-29/+33
| | |
* | | Merge pull request #18395 from shunsukeaida/improve_generator_name_suggestionsRichard Schneeman2015-02-231-3/+1
|\ \ \ | | | | | | | | Improve generator name suggestions a bit.
| * | | Improve generator name suggestions a bit.ShunsukeAida2015-02-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the Levenshtein distances to most commands were wrongly calculated due to a big shortcut. This might be included in the original code for the performance sake, but I'm not sure that's something we should take over accuracy in Rails. Before 'foo' to 'assets' #=> 3 'foo' to 'controller' #=> 3 'foo' to 'generator' #=> 3 'foo' to 'helper' #=> 3 'foo' to 'integration_test' #=> 3 'foo' to 'jbuilder' #=> 3 'foo' to 'job' #=> 2 'foo' to 'mailer' #=> 3 'foo' to 'migration' #=> 3 'foo' to 'model' #=> 3 'foo' to 'resource' #=> 3 'foo' to 'resource_route' #=> 3 'foo' to 'scaffold' #=> 3 'foo' to 'scaffold_controller' #=> 3 'foo' to 'task' #=> 4 'foo' to 'active_record:migration' #=> 3 'foo' to 'active_record:model' #=> 3 'foo' to 'coffee:assets' #=> 3 'foo' to 'css:assets' #=> 3 'foo' to 'css:scaffold' #=> 3 'foo' to 'erb:controller' #=> 3 'foo' to 'erb:mailer' #=> 3 'foo' to 'erb:scaffold' #=> 3 'foo' to 'js:assets' #=> 3 'foo' to 'scss:assets' #=> 3 'foo' to 'scss:scaffold' #=> 3 'foo' to 'test_unit:controller' #=> 3 'foo' to 'test_unit:generator' #=> 3 'foo' to 'test_unit:helper' #=> 3 'foo' to 'test_unit:integration' #=> 3 'foo' to 'test_unit:job' #=> 3 'foo' to 'test_unit:mailer' #=> 3 'foo' to 'test_unit:model' #=> 3 'foo' to 'test_unit:plugin' #=> 3 'foo' to 'test_unit:scaffold' #=> 3 After 'foo' to 'assets' #=> 6 'foo' to 'controller' #=> 8 'foo' to 'generator' #=> 8 'foo' to 'helper' #=> 6 'foo' to 'integration_test' #=> 15 'foo' to 'jbuilder' #=> 8 'foo' to 'job' #=> 2 'foo' to 'mailer' #=> 6 'foo' to 'migration' #=> 8 'foo' to 'model' #=> 4 'foo' to 'resource' #=> 7 'foo' to 'resource_route' #=> 12 'foo' to 'scaffold' #=> 6 'foo' to 'scaffold_controller' #=> 16 'foo' to 'task' #=> 4 'foo' to 'active_record:migration' #=> 21 'foo' to 'active_record:model' #=> 17 'foo' to 'coffee:assets' #=> 12 'foo' to 'css:assets' #=> 10 'foo' to 'css:scaffold' #=> 10 'foo' to 'erb:controller' #=> 12 'foo' to 'erb:mailer' #=> 10 'foo' to 'erb:scaffold' #=> 10 'foo' to 'js:assets' #=> 9 'foo' to 'scss:assets' #=> 11 'foo' to 'scss:scaffold' #=> 11 'foo' to 'test_unit:controller' #=> 18 'foo' to 'test_unit:generator' #=> 18 'foo' to 'test_unit:helper' #=> 16 'foo' to 'test_unit:integration' #=> 20 'foo' to 'test_unit:job' #=> 12 'foo' to 'test_unit:mailer' #=> 16 'foo' to 'test_unit:model' #=> 14 'foo' to 'test_unit:plugin' #=> 16 'foo' to 'test_unit:scaffold' #=> 16 Besides that, the conjunction "or" of the message now appears only between the last two suggestions.
* | | | Merge pull request #19046 from yui-knk/fix/ormAbdelkader Boudih2015-02-231-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] Fix `Object-Relational` to `Object Relational`
| * | | | [ci skip] Fix `Object-Relational` to `Object Relational`yui-knk2015-02-241-1/+1
|/ / / /
* | | | Merge pull request #18937 from simi/optional-belongs-toRafael Mendonça França2015-02-2314-10/+166
|\ \ \ \ | | | | | | | | | | Require `belongs_to` by default.
| * | | | Require `belongs_to` by default.Josef Šimánek2015-02-2114-10/+166
| | |/ / | |/| | | | | | | | | | Deprecate `required` option in favor of `optional` for belongs_to.
* | | | Merge pull request #19032 from jvanbaarsen/changed-ajadapter-env-varRafael Mendonça França2015-02-236-7/+7
|\ \ \ \ | | | | | | | | | | Changed the AJADAPTER to AJ_ADAPTER
| * | | | Changed the AJADAPTER to AJ_ADAPTERJeroen van Baarsen2015-02-226-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This allows for easier reading, since those are two words, so they should be split by _ Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | | Merge pull request #19044 from y-yagi/mime_type_docAbdelkader Boudih2015-02-231-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | fix method name in mime type example. `Mime::Type.[]` doesn't exist. [ci skip]
| * | | | fix method name in mime type example. `Mime::Type.[]` doesn't exist. [ci skip]yuuji.yaginuma2015-02-231-1/+1
|/ / / /
* | | | Minor guides edits [ci skip]Robin Dupret2015-02-212-24/+23
| | | |
* | | | Merge pull request #19026 from rousisk/masterRobin Dupret2015-02-211-2/+3
|\ \ \ \ | | | | | | | | | | Improve wording on find_by note regarding returning only one record [ci skip]
| * | | | Improve wording on find_by note regarding returning only one record [ci skip]Konstantinos Rousis2015-02-211-2/+3
|/ / / /
* | | | [ci skip] Use explicit module namespace in guideKasper Timm Hansen2015-02-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Engines guide used an inline namespace, `Blorgh::ApplicationController`, which caused problems for users using an explicit module namespace because the `ApplicationController` inherited from wasn't fully qualified. The controller qualification was fixed in 661479324d573d419d8e15a1ea257e01856084af. This ditches the inline namespace and makes the example more consistent with others in the guide.
* | | | guides, fully qualify `ApplicationController`. Closes #19024.Yves Senn2015-02-211-1/+1
| |_|/ |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-08 23:51:24 +0000