aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #6993 from morgoth/engine-table-name-prefix-generator-fixJosé Valim2012-07-073-2/+14
|\ \ \ \ \ | | | | | | | | | | | | Engine table name prefix generator fix
| * | | | | Fixed generating namespaced table_name_prefix in enginesWojciech Wnętrzak2012-07-062-2/+2
| | | | | |
| * | | | | Added failing test for generating namespaced table_name_prefix in enginesWojciech Wnętrzak2012-07-061-0/+12
| | | | | |
* | | | | | Merge pull request #6996 from kennyj/remove_unused_code_20120707José Valim2012-07-071-4/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused code.
| * | | | | | Remove unused code.kennyj2012-07-071-4/+0
| | | | | | |
* | | | | | | Merge pull request #6997 from kennyj/fix_stored_attributesJosé Valim2012-07-074-2/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added *instance_writer: false* to stored/serialized attributes.
| * | | | | | | Added *instance_writer: false* for stored/serialized attributes.kennyj2012-07-074-2/+16
| |/ / / / / /
* | | | | | | Update masterJosé Valim2012-07-071-0/+2
| | | | | | |
* | | | | | | Merge pull request #6987 from dmathieu/limit_inspectJosé Valim2012-07-073-3/+22
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Limit the number of records in Relation#inspect
| * | | | | | Limit the number of records in Relation#inspectDamien Mathieu2012-07-063-3/+22
| |/ / / / / | | | | | | | | | | | | | | | | | | While it's interesting to have the results array, it can make a console or a webpage freeze if there are a lot of them. So this limits the number of records displayed in #inspect to 10 and tells how much were effectively found.
* | | | | | Fix failing AM test due to missing templateCarlos Antonio da Silva2012-07-061-1/+1
| | | | | |
* | | | | | Improve docs, changelog and release notes for Action Mailer default_options=Carlos Antonio da Silva2012-07-064-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #6950 from paneq/default_from2Carlos Antonio da Silva2012-07-064-3/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce config.action_mailer.default_options= Allows to easily set :from, :replay_to, etc. options in config/application.rb using simple syntax: config.action_mailer.default_options = { from: "no-replay@example.org" } Closes #6747
| * | | | | | Introduce config.action_mailer.default_from=Robert Pankowecki2012-07-034-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to easily set :from, :replay_to, etc. options in config/application.rb using simple syntax: config.action_mailer.default_options = {from:"no-replay@example.org"} This was not possible using #default method because config.action_mailer.default(from: "no-replay@example.org") is interpreated as reader method and just returns nil. It would not call ActionMailer::Base.default method. The only way of calling this method from config/application.rb was to use the direct syntax which looks ugly in my opinion: config.assets.enabled = false config.assets.version = '1.0' config.encoding = "utf-8" config.action_mailer.default_url_options= { host:"example.org", protocol:"https" } ActionMailer::Base.default(from: "no-replay@example.org")
* | | | | | | Merge pull request #6995 from frodsan/update_test_helpCarlos Antonio da Silva2012-07-061-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | update test_help to config properly turn natural language option
| * | | | | | | update test_help to config properly turn natural language optionFrancesco Rodriguez2012-07-061-1/+4
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Last versions of Turn don't monkey patch MiniTest to setup the natural language option. Here is an [example](https://github.com/TwP/turn/blob/master/try/test_autorun_minitest.rb#L3). This patches the following behaviour: $ rake test:units `<top (required)>': undefined method `use_natural_language_case_names=' for MiniTest::Unit:Class (NoMethodError)
* | | | | | | Merge pull request #6990 from mirceapricop/bug/mime-type-method-nameJosé Valim2012-07-064-2/+33
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix: Mime type names conflict with Object methods
| * | | | | | Prevent conflict between mime types and Object methodsMircea Pricop2012-07-064-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assuming the type ":touch", Collector.new was calling send(:touch), which instead of triggering method_missing and generating a new collector method, actually invoked the private method `touch` inherited from Object. By generating the method for each mime type as it is registered, the private methods on Object can never be reached by `send`, because the `Collector` will have them before `send` is called on it. To do this, a callback mechanism was added to Mime::Type This allows someone to add a callback for whenever a new mime type is registered. The callback then gets called with the new mime as a parameter. This is then used in AbstractController::Collector to generate new collector methods after each mime is registered.
* | | | | | | Merge pull request #6985 from sidonath/disable-query-cache-for-locksRafael Mendonça França2012-07-062-1/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Disable query cache for lock queries
| * | | | | | | Disable query cache for lock queriesDamir Zekic2012-07-062-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #867
* | | | | | | | Update release notes with AR::Relation#inspect change [ci skip]Carlos Antonio da Silva2012-07-062-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See 07314e64fd62fb8e6165c8c539420160da9437e9. Also fix some tabs in AR Changelog.
* | | | | | | | Remove mention to csv fixtures from test_helper in guides [ci skip]Carlos Antonio da Silva2012-07-061-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Show the records in Relation#inspectJon Leighton2012-07-063-6/+17
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for removing the previous implementation of `#inspect` was that it hid from you that you were dealing with a `Relation` rather than an `Array`. But it is still useful to be able to see the records, particularly if you're writing something like the following in tests: assert_equal [foo], Post.where(:bar) If the assertion fails, you want to see what records were actually loaded. So this implementation makes it clear that you've got a `Relation`, but also shows your records.
* | | | | | Merge pull request #6927 from parndt/patch-3Carlos Antonio da Silva2012-07-052-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make ArgumentError message more consistent in nested attributes
| * | | | | | Made ArgumentError messages consistent.Philip Arndt2012-07-062-3/+3
| | | | | | |
* | | | | | | Revert "push parameter instantiation to one method"Aaron Patterson2012-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9669f6f7883787aa209207cab68b1069636aed9e. This breaks Sam Ruby's tests for some reason. Revert until we figure it out.
* | | | | | | Merge branch 'master' into testcleanAaron Patterson2012-07-059-6/+81
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Add documentation for inheritance_column method Use ArgumentError vs. RuntimeError, which is more precise. CSV fixtures aren't supported by default anymore, update generated test_helper.rb to reflect that fix quoting for ActiveSupport::Duration instances Add few information on the field types Add the options method to action_controller testcase.
| * \ \ \ \ \ \ Merge pull request #6976 from vitorbal/masterCarlos Antonio da Silva2012-07-051-1/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add documentation for inheritance_column method [ci skip]
| | * | | | | | | Add documentation for inheritance_column methodVitor Balocco2012-07-051-1/+3
| |/ / / / / / /
| * | | | | | | Merge pull request #6957 from francois2metz/options_methodCarlos Antonio da Silva2012-07-052-2/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add the options method to action_controller testcase.
| | * | | | | | | Add the options method to action_controller testcase.François de Metz2012-07-042-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: François de Metz <francois@stormz.me>
| * | | | | | | | Merge pull request #6959 from robin850/patch-1José Valim2012-07-051-0/+49
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add few information on the field types
| | * | | | | | | | Add few information on the field typesRobin Dupret2012-07-041-0/+49
| | |/ / / / / / /
| * | | | | | | | Merge pull request #6967 from frodsan/quite_as_durationRafael Mendonça França2012-07-053-1/+15
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix quoting for ActiveSupport::Duration instances
| | * | | | | | | | fix quoting for ActiveSupport::Duration instancesFrancesco Rodriguez2012-07-043-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes quoting for ActiveSupport::Duration instances: # before >> ActiveRecord::Base.connection.quote 30.minutes => "'--- 1800\n...\n'" # after >> ActiveRecord::Base.connection.quote 30.minutes => "1800" Also, adds a test for type casting ActiveSupport::Duration instances. Related to #1119.
| * | | | | | | | | Merge pull request #6969 from mkdynamic/patch-1Jeremy Kemper2012-07-041-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Use ArgumentError vs. RuntimeError, which is more precise
| | * | | | | | | | | Use ArgumentError vs. RuntimeError, which is more precise.Mark Dodwell2012-07-041-1/+1
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #6968 from guilleiguaran/update-test-helperRafael Mendonça França2012-07-041-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | CSV fixtures aren't supported by default anymore, update generated test_helper.rb to reflect that
| | * | | | | | | | | CSV fixtures aren't supported by default anymore, update generated ↵Guillermo Iguaran2012-07-041-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_helper.rb to reflect that
* | | | | | | | | | Merge branch 'master' into testcleanAaron Patterson2012-07-045-13/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: activesupport gem dependencies should reflect the versions we actually use fix link and add activeresource link in release notes page [ci skip] Update 4.0 Release Notes Kill not used constant since removal of runner method
| * | | | | | | | | activesupport gem dependencies should reflect the versions we actually useAaron Patterson2012-07-043-1/+2
| |/ / / / / / / /
| * | | | | | | | Merge pull request #6961 from frodsan/fix_release_noteSantiago Pastorino2012-07-041-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | fix link and add activeresource link in release notes page [ci skip]
| | * | | | | | | fix link and add activeresource link in release notes page [ci skip]Francesco Rodriguez2012-07-041-2/+2
| |/ / / / / / /
| * | | | | | | Update 4.0 Release NotesRafael Mendonça França2012-07-041-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related with 17d2115e3df6caf15d554b44e28177069fa3ed5b
| * | | | | | | Kill not used constant since removal of runner methodCarlos Antonio da Silva2012-07-031-9/+0
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Runner method was removed in ada571bfcdbad669ae43a4dd18277ef227680a0b.
* | | | | | | push parameter instantiation to one methodAaron Patterson2012-07-031-1/+1
| | | | | | |
* | | | | | | add Mime.fetch so we can have default mime typesAaron Patterson2012-07-032-2/+6
| | | | | | |
* | | | | | | make the default environment have actual defaultsAaron Patterson2012-07-032-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of deleting keys on every instantiation, create defaults we actually use. eventually we can pass an environment in to the request, and create a new req / res object on each call.
* | | | | | | assing the request on the response only onceAaron Patterson2012-07-031-4/+5
| | | | | | |
* | | | | | | group things that are alikeAaron Patterson2012-07-032-10/+10
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 03:52:45 +0000