aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixes #18492Vipul A M2015-01-147-12/+46
| | | | | | | - Add check for not deleting previously created fixtures, to overcome sti fixtures from multiple files - Added fixtures and fixtures test to verify the same - Fixed wrong fixtures duplicating data insertion in same table
* Merge pull request #18478 from ↵Sean Griffin2015-01-131-1/+2
|\ | | | | | | | | yoshiokatsuneo/active_record_connection_pool_error_disconnect ActiveRecord: On reconnection failure, release only failed connetion.
| * ActiveRecord: On reconnection failure, release only failed connetion.Yoshioka Tsuneo2015-01-131-1/+2
| | | | | | | | | | | | | | On reconnection failure, all the connection was released. But, it is better to release only failed connection. This patch changes not to release all the connection but release only failed connection.
* | Merge pull request #18491 from dreeve/form-for-guide-fix-generated-actionAbdelkader Boudih2015-01-131-2/+2
|\ \ | | | | | | Fix form_for guide binding a form to an object. [ci skip]
| * | Fix form_for guide binding a form to an object.Derek Reeve2015-01-131-2/+2
| | | | | | | | | | | | | | | | | | | | | The HTML generated using url: { action: :create} will not generate the form action "/articles/create", it should generate the form action "/articles" for a new object.
* | | Merge pull request #18489 from Envek/ru_timezonesAndrew White2015-01-132-1/+9
|\ \ \ | |/ / |/| | Add missing time zone definitions for Russian Federation
| * | Add missing time zone definitions for Russian FederationAndrey Novikov2015-01-132-1/+9
| | | | | | | | | | | | Also sync Russian Federation time zones with `zone.tab` file from tzdata version 2014j.
* | | Merge pull request #18490 from andreynering/security-guides-remove-resourceAbdelkader Boudih2015-01-131-1/+0
|\ \ \ | | | | | | | | Guides: Removing reference to blog that is not updated anymore [ci skip]
| * | | Guides: Removing reference to blog that is not updated anymore [ci skip]Andrey Nering2015-01-131-1/+0
| | | |
* | | | Merge pull request #18476 from Alamoz/scaffold_index_view_grammarDavid Heinemeier Hansson2015-01-131-1/+1
|\ \ \ \ | | | | | | | | | | Clean up grammar in scaffold index view, by removing the word 'Listing' ...
| * | | | Clean up grammar in scaffold index view, by removing the word 'Listing' from ↵Adrien Lamothe2015-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | list title.
* | | | | Add the `method_source` gem to the default GemfileSean Griffin2015-01-133-0/+15
| | | | | | | | | | | | | | | | | | | | Fixes #18473
* | | | | Stop promoting rack-cache usage at the moment (not so common or important to ↵David Heinemeier Hansson2015-01-131-6/+0
| | | | | | | | | | | | | | | | | | | | deserve that billing)
* | | | | Show how to change the queuing backend for ActiveJob in productionDavid Heinemeier Hansson2015-01-131-0/+4
| | | | |
* | | | | Set all asset options togetherDavid Heinemeier Hansson2015-01-131-3/+3
| |_|/ / |/| | |
* | | | Merge pull request #18471 from ahmad-alkheat/masterRafael Mendonça França2015-01-131-0/+6
|\ \ \ \ | |_|/ / |/| | | Added the SQL equivalent of the find_by method. [ci skip]
| * | | Updated active_record_querying.mdAhmad Al-kheat2015-01-121-0/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | Added the SQL equivalent of the find_by method Update active_record_querying.md Update active_record_querying.md
* | | Merge pull request #18480 from karpah/patch-1Claudio B.2015-01-131-1/+1
|\ \ \ | | | | | | | | Update asset pipeline guide
| * | | Digesting is now enabled by default in developmentRebecca Skinner2015-01-131-1/+1
| |/ /
* | | Merge pull request #18479 from mechanicles/change-a-to-an-for-htmlClaudio B.2015-01-131-1/+1
|\ \ \ | |/ / |/| | Change a to an for HTML word [ci skip]
| * | Change a to an for HTML word [ci skip]Santosh Wadghule2015-01-131-1/+1
|/ /
* | Merge pull request #18439 from mokhan/validates-acceptance-of-arraySean Griffin2015-01-123-2/+18
|\ \ | | | | | | allow '1' or true for acceptance validation.
| * | allow '1' or true for acceptance validation.mo khan2015-01-103-2/+18
| | |
* | | Merge pull request #18462 from dmasur/patch-1Yves Senn2015-01-122-1/+10
|\ \ \ | | | | | | | | Removing :en in favor of default locale for duration#inspect
| * | | Removing :en in favor of I18n.default_locale in duration#inspectDominik Masur2015-01-122-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi there, i have an app without english as available locale. So i got an error when we try to inspect something like 1.day. This is done automatically when we use the dalli cache. I would like to change the :en to ::I18n.default_locale to be sure that this is always constant and is an available locale. Tests are all green with this change. Calculating ------------------------------------- :locale => :en 2.024k i/100ms :locale => ::I18n.default_locale 2.236k i/100ms ------------------------------------------------- :locale => :en 25.758k (±26.3%) i/s - 117.392k :locale => ::I18n.default_locale 26.311k (±18.1%) i/s - 127.452k
* | | | Relax Rack dependencySantiago Pastorino2015-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rack is very carefully released, we should be able to upgrade minor versions without much effort. We are a bunch of Rails core who are also Rack core members so there won't be any issue with that. And in case there's something wrong, we should fix on both sides. Even though, doesn't seem like we will have a 1.7 version, this will be useful as an example for when we go with Rack 2.0. We should ~> 2.0.
* | | | Merge pull request #18466 from davydovanton/error_message_docAbdelkader Boudih2015-01-121-2/+2
|\ \ \ \ | |/ / / |/| | | Fix description for ActiveModel::Errors#generate_message [skip ci]
| * | | Fix error messages scope [skip ci]Anton Davydov2015-01-121-2/+2
|/ / /
* | | Merge pull request #18460 from mechanicles/a-to-an-for-xmlXavier Noria2015-01-121-2/+2
|\ \ \ | | | | | | | | Change 'a' to 'an' for 'XML' word [ci skip]
| * | | Change 'a' to 'an' for 'XML' word [ci skip]Santosh Wadghule2015-01-121-2/+2
| | | |
* | | | Merge pull request #18461 from zetsubo/patch-1Matthew Draper2015-01-121-1/+1
|\ \ \ \ | |/ / / |/| | | minor grammatical fix in documentation
| * | | minor grammatical fix in documentationJade McGough2015-01-121-1/+1
|/ / /
* | | Merge pull request #18436 from deepj/fork-detectionCarlos Antonio da Silva2015-01-111-1/+1
|\ \ \ | | | | | | | | Better fork detection in ActiveSupport::Testing::Isolation
| * | | Better fork detection in ActiveSupport::Testing::Isolationdeepj2015-01-101-3/+1
| |/ / | | | | | | | | | | | | Process.respond_to?(:fork) returns false if fork is not available. More on http://www.ruby-doc.org/core-2.0.0/Process.html#method-c-fork
* | | Merge pull request #18456 from claudiob/remove-unused-fixtures-to-renderCarlos Antonio da Silva2015-01-111-65/+0
|\ \ \ | | | | | | | | Remove unused AV fixtures from AP tests
| * | | Remove unused AV fixtures from AP testsclaudiob2015-01-111-65/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `render` was moved from ActionPack to ActionView in acc8e259, some fixtures required by the tests were duplicated, but they are actually only required by ActionView tests. To give one example, `double_render` is already defined [in the AV tests](https://github.com/rails/rails/blob/72139d8d310d896db78eaec98582c7a638135102/actionview/test/actionpack/controller/render_test.rb#L407) and is never used in the ActionPack tests.
* | | | Merge pull request #18454 from claudiob/test-on-option-for-amv-callbacksCarlos Antonio da Silva2015-01-111-0/+26
|\ \ \ \ | | | | | | | | | | Add test for AM::Validation::Callbacks with :on
| * | | | Add test for AM::Validation::Callbacks with :onclaudiob2015-01-111-0/+26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `before_validation` and `after_validation` from ActiveModel::Validation::Callbacks accept an optional `:on` parameter that was not previously documented or tested. For instance given before_validation :do_something, on: :create then `object.valid?(:create)` will invoke `:do_something` while `object.valid?` or `object.valid?(:anything_else)` will not.
* | | | Merge pull request #18455 from claudiob/remove-unused-deprecated_reload-methodCarlos Antonio da Silva2015-01-111-4/+0
|\ \ \ \ | |/ / / |/| | | Remove unused "deprecated_reload" method
| * | | Remove unused "deprecated_reload" methodclaudiob2015-01-111-4/+0
|/ / / | | | | | | | | | | | | | | | The method was introduced in https://github.com/rails/rails/commit/66d0a0153578ce760d822580c5b8c0b726042ac2#diff-8cec05860729a3851ceb756f4dd90370R49 for the "reset_changes is deprecated" test, but this test was successively removed in https://github.com/rails/rails/commit/37175a24bd508e2983247ec5d011d57df836c743
* | | Merge pull request #18448 from robertomiranda/has_secure_token_generatorGuillermo Iguaran2015-01-116-1/+51
|\ \ \ | | | | | | | | Add has secure token to migration generator
| * | | Add Secure Token Generatorrobertomiranda2015-01-116-1/+51
| | | |
* | | | Merge pull request #18451 from jlduran/guides-sql-cachingRafael Mendonça França2015-01-111-0/+4
|\ \ \ \ | | | | | | | | | | Re-add section in SQL Caching [ci skip]
| * | | | Re-add section in SQL CachingJose Luis Duran2015-01-111-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | This section was accidentally removed in 4b5e424441149cf0f61a8182f4a92999577ce59a, and partially re-added in dc14b893e5904acb37ac327478f3880f33094b7a. [ci skip]
* | | | Merge pull request #18452 from claudiob/fix-broken-assertionRafael Mendonça França2015-01-111-1/+1
|\ \ \ \ | |/ / / |/| | | Fix assertion that was never run
| * | | Fix assertion that was never runclaudiob2015-01-111-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to run whether the `welcome` method of the ActionMailer::Base subclass raises an error, `message` must be called, otherwise the method is not executed at all. You could just replace with `def welcome; raise StandardError; end` and you would still see a passing test. This commit fixes the test so the assertion is actually executed, just like any other tests in the file, where `.message` is called.
* | | Merge pull request #18435 from kuldeepaggarwal/f-remove-unnecessary-requireRafael Mendonça França2015-01-117-8/+0
|\ \ \ | | | | | | | | No need of requiring `rbconfig`, it is by-default loaded
| * | | No need of requiring `rbconfig`, it is by-default loadedKuldeep Aggarwal2015-01-107-8/+0
| |/ /
* | | Merge pull request #18445 from y-yagi/remove_hide_actionsRafael Mendonça França2015-01-111-1/+0
|\ \ \ | | | | | | | | remove autoload HideActions, no longer exist
| * | | remove autoload HideActions, no longer existyuuji.yaginuma2015-01-111-1/+0
|/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 13:18:15 +0000