aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12750 from arunagw/webconsole-invite-onlyGuillermo Iguaran2013-11-033-15/+0
|\ | | | | Not adding webconsole by default in new apps
| * No web-console for nowArun Agrawal2013-11-033-15/+0
|/
* Line up the comments for aestheticsDavid Heinemeier Hansson2013-11-031-5/+5
|
* AestheticsDavid Heinemeier Hansson2013-11-031-22/+30
|
* Code style for privacy indentionDavid Heinemeier Hansson2013-11-031-8/+8
|
* Ensure backwards compability after the #deep_munge extractionDavid Heinemeier Hansson2013-11-031-0/+10
|
* Add test verifying that you can only sort ARs of the same typeDavid Heinemeier Hansson2013-11-021-1/+7
|
* Revert "ActiveRecord::Base#<=> has been removed. Primary keys may not be in ↵David Heinemeier Hansson2013-11-023-12/+16
| | | | | | | | | order," -- will be replaced with a check to ensure that the keys used for comparison are integers, and only fail if they are not. This reverts commit 6256734e2d0bdd89f4b5d11da259d40afa0c95c7. Conflicts: activerecord/CHANGELOG.md
* Delegate #rewhere to all on the class like all other relation methodsDavid Heinemeier Hansson2013-11-022-1/+5
|
* Move documentation around a bitDavid Heinemeier Hansson2013-11-021-4/+7
|
* Merge pull request #12747 from yury/explicit-enum-valuesDavid Heinemeier Hansson2013-11-024-1/+15
|\ | | | | Explicit mapping for enum
| * Explicit mapping for enumYury Korolev2013-11-024-1/+15
| |
* | Added ActiveRecord::QueryMethods#rewhere which will overwrite an existing, ↵David Heinemeier Hansson2013-11-023-0/+52
| | | | | | | | named where condition.
* | unscope now works on default_scope after ↵Rafael Mendonça França2013-11-023-9/+9
|/ | | | 94924dc32baf78f13e289172534c2e71c9c8cade
* Add a test case for the scope enum addsDavid Heinemeier Hansson2013-11-021-0/+4
|
* Extend ActiveRecord::Base#cache_key to take an optional list of timestamp ↵David Heinemeier Hansson2013-11-024-2/+27
| | | | attributes of which the highest will be used.
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2013-11-0210-94/+48
|\
| * Use an already existing fixtureCarlos Antonio da Silva2013-11-021-1/+1
| |
| * Fix to work on Ruby 1.9.3, example and changelog improvementsCarlos Antonio da Silva2013-11-024-34/+34
| |
| * Improve wording in AC::ParameterMissing error messageGuillermo Iguaran2013-11-021-1/+1
| |
| * Update guides welcome page to point to version 3.2.15 [ci skip]Carlos Antonio da Silva2013-11-021-1/+1
| |
| * Revert "Merge pull request #9660 from ↵Guillermo Iguaran2013-11-025-57/+11
| | | | | | | | | | | | | | | | | | sebasoga/change_strong_parameters_require_behaviour" This reverts commit c2b5a8e61ba0f35015e6ac949a5c8fce2042a1f2, reversing changes made to 1918b12c0429caec2a6134ac5e5b42ade103fe90. See: https://github.com/rails/rails/pull/9660#issuecomment-27627493
* | Added Numeric#in_milliseconds, like 1.hour.in_milliseconds, so we can feed ↵David Heinemeier Hansson2013-11-023-0/+14
|/ | | | them to JavaScript functions like getTime().
* Added ActiveRecord::Base#enum for declaring enum attributes where the values ↵David Heinemeier Hansson2013-11-027-2/+128
| | | | map to integers in the database, but can be queried by name
* Merge pull request #12686 from kryzhovnik/masterCarlos Antonio da Silva2013-11-021-6/+6
|\ | | | | | | | | | | | | Minor doc fix of ActiveModel::Naming. [ci skip] Conflicts: activemodel/lib/active_model/naming.rb
| * Minor doc fix of ActiveModel::Naming.Andrey Samsonov2013-10-291-6/+6
| | | | | | | | | | - qoute example line's result when it kind of String - right ("singular_route_key") method in example
* | Merge pull request #9660 from ↵Guillermo Iguaran2013-11-015-11/+57
|\ \ | | | | | | | | | | | | sebasoga/change_strong_parameters_require_behaviour Change ActionController::Parameters#require behavior when value is empty
| * | Change ActionController::Parameters#require behavior when value is emptySebastian Sogamoso2013-03-115-11/+57
| | | | | | | | | | | | | | | When the value for the required key is empty an ActionController::ParameterMissing is raised which gets caught by ActionController::Base and turned into a 400 Bad Request reply with a message in the body saying the key is missing, which is misleading. With these changes, ActionController::EmptyParameter will be raised which ActionController::Base will catch and turn into a 400 Bad Request reply with a message in the body saying the key value is empty.
* | | Fix wrong behavior where associations with dependent: :destroy optionsRafael Mendonça França2013-11-013-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | was using nullify strategy This caused a regression in applications trying to upgrade. Also if the user set the dependent option as destroy he expects to get the records removed from the database.
* | | Merge pull request #12739 from laurocaetano/remove_warnings_for_ruby_trunkRafael Mendonça França2013-11-015-6/+6
|\ \ \ | | | | | | | | Remove warnings on ruby trunk
| * | | remove warnings on ruby trunklaurocaetano2013-11-015-6/+6
|/ / /
* | | Test with the right associationRafael Mendonça França2013-11-011-3/+3
| | |
* | | Merge pull request #12733 from robin850/fix-railties-buildRafael Mendonça França2013-11-015-6/+6
|\ \ \ | | | | | | | | Fix railties build
| * | | Fix some failing tests for Rails::PathsRobin Dupret2013-11-012-3/+3
| | | | | | | | | | | | | | | | | | | | Since we are not using the File.exists? alias which raises a warning on current ruby trunk, few stubs are wrong.
| * | | Set the destination_root for pluginsRobin Dupret2013-11-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since the plugin generator is relying on the application one, we need to define the proper root when creating the plugin. The AppBase class is not setting the destination_root (this is done via the AppGenerator)
| * | | Remove "circular require considered harmful" errorRobin Dupret2013-11-012-3/+2
| | | | | | | | | | | | | | | | | | | | rails/generators should not load rails/generators/base since the latter is loading it.
* | | | Merge pull request #12735 from linstula/fix-typo-in-responder-commentRafael Mendonça França2013-11-011-1/+1
|\ \ \ \ | | | | | | | | | | Fix typo in method description in Responder class
| * | | | Fix typo in method description in Responder classLin Reid2013-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes a typo in the description for the call class method in Responder.
* | | | | Merge pull request #12728 from arunagw/aa-warnings-removed-ruby-trunkRafael Mendonça França2013-11-0119-31/+31
|\ \ \ \ \ | |/ / / / |/| | | | More Warnings removed for ruby trunk
| * | | | shadowing variable warning removedArun Agrawal2013-11-011-1/+1
| | | | |
| * | | | More Warnings removed for ruby trunkArun Agrawal2013-11-0119-30/+30
| | | | | | | | | | | | | | | | | | | | Same as 4d4ff531b8807ee88a3fc46875c7e76f613956fb
* | | | | :bomb:Rafael Mendonça França2013-11-011-1/+1
| | | | |
* | | | | Use consistent order of the argumentsRafael Mendonça França2013-11-011-9/+9
|/ / / /
* | | | Merge pull request #12729 from arunagw/build-fixed-ruby193Rafael Mendonça França2013-11-012-2/+8
|\ \ \ \ | | | | | | | | | | Can't used named argument in ruby 1.9.3
| * | | | Passing args for gemfile entryArun Agrawal2013-11-012-2/+8
| |/ / / | | | | | | | | | | | | Fixing build
* | | | Merge pull request #12732 from razielgn/additional-rbx-depRafael Mendonça França2013-11-011-0/+1
|\ \ \ \ | |/ / / |/| | | Added rubysl-rexml to Rubinius deps.
| * | | Added rubysl-rexml to Rubinius deps.Federico Ravasio2013-11-011-0/+1
|/ / /
* | | Merge pull request #12727 from arunagw/aa-warnings-removed-ruby-trunkSantiago Pastorino2013-11-019-29/+29
|\ \ \ | | | | | | | | Warnings removed for ruby trunk
| * | | Warnings removed for ruby trunkArun Agrawal2013-11-019-29/+29
|/ / / | | | | | | Same as 4d4ff531b8807ee88a3fc46875c7e76f613956fb
* | | Merge pull request #12713 from utenmiki/documentYves Senn2013-11-011-0/+2
|\ \ \ | | | | | | | | Add Rdoc document for Array#forty_two [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 17:37:51 +0000