aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #18417 from ↵Sean Griffin2015-01-091-0/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | yoshiokatsuneo/active_record_connection_pool_error_disconnect ActiveRecord: release connection on reconnect failure.
| * | | ActiveRecord: release connection on reconnect failure.Yoshioka Tsuneo2015-01-091-0/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to checkout connection from connection pool, checkout()(and checkout_and_verify) verify whether the connection is active or not. And, if the connection is not active, connection adapters try to reconnect to server. And, if database is down at this moment, reconnect fails and exception is raised. (Ex: Mysql2::Error: Can't connect to local MySQL server through socket xxx) But, ConnectionPool does not catch the exception, but leaks current disconnected connection to @connection. So, if database's temporary down happens several times and exceeds the number of connection pool(5 by default), activerecord will be no more available, even if database server is already recovered. This patch fix it by catching exception and releasing connection.
* | | Merge pull request #18410 from seuros/ripfilterRafael Mendonça França2015-01-083-9/+37
|\ \ \ | | | | | | | | remove *_filter
| * | | Deprecate all *_filter callbacks in favor of *_action callbacksAbdelkader Boudih2015-01-083-9/+37
|/ / /
* | | Merge pull request #18404 from claudiob/rebase-14549Rafael Mendonça França2015-01-082-0/+44
|\ \ \ | | | | | | | | Add test case and documentation for skip_before_filter.
| * | | Add test/doc for :if/:except in skip_before_actionclaudiob2015-01-082-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new test/docs further explain the conflicts that can happen when mixing `:if`/`:unless` options with `:only`/`:except` options in `skip_before_action`. The gist is that "positive" filters always have priority over negative ones. The previous commit already showed that `:only` has priority over `:if`. This commit shows that `:if` has priority over `:except`. For instance, the following snippets are equivalent: ```ruby skip_before_action :some_callback, if: -> { condition }, except: action ``` ```ruby skip_before_action :some_callback, if: -> { condition } ```
| * | | Add test case and documentation for skip_before_filter.Lauro Caetano2015-01-082-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test case for using skip_before_filter with the options :only and :if both present. In this case, the :if option will be ignored and :only will be executed. Closes #14549 (the commit was cherry-picked from there).
* | | | Fix the example (for realz)David Heinemeier Hansson2015-01-081-1/+1
| | | |
* | | | Fix the exampleDavid Heinemeier Hansson2015-01-081-1/+1
| | | |
* | | | Merge pull request #18334 from simi/prepend-false-for-protect-from-forgeryDavid Heinemeier Hansson2015-01-083-1/+91
|\ \ \ \ | | | | | | | | | | Add prepend option to protect_from_forgery.
| * | | | Add prepend option to protect_from_forgery.Josef Šimánek2015-01-083-1/+91
|/ / / /
* | | | Merge pull request #18371 from brainopia/remove_hide_actionsDavid Heinemeier Hansson2015-01-085-93/+7
|\ \ \ \ | |_|/ / |/| | | Remove ActionController::HideActions (closes #18336)
| * | | Remove ActionController::HideActions (closes #18336)brainopia2015-01-065-93/+7
| | | |
* | | | Document has_many :extend optionCaleb Thompson2015-01-081-0/+4
| |/ / |/| | | | | | | | https://github.com/rails/rails/commit/5937bd02dee112646469848d7fe8a8bfcef5b4c1#commitcomment-9205786
* | | Merge pull request #18403 from georgeclaghorn/enqueued-email-assertionsDavid Heinemeier Hansson2015-01-085-2/+144
|\ \ \ | | | | | | | | Enqueued email assertions
| * | | Add assert_enqueued_emails and assert_no_enqueued_emailsGeorge Claghorn2015-01-083-0/+115
| | | |
| * | | Add :only option to assert_no_enqueued_jobsGeorge Claghorn2015-01-082-2/+29
|/ / /
* | | Fix Active Job changelog formatting and reword a bit [ci skip]Carlos Antonio da Silva2015-01-081-24/+22
| | |
* | | Merge pull request #18397 from georgeclaghorn/enhance-job-assertionsDavid Heinemeier Hansson2015-01-073-7/+76
|\ \ \ | | | | | | | | Add :only option to assert_enqueued_jobs
| * | | Add :only option to assert_enqueued_jobsGeorge Claghorn2015-01-073-7/+76
|/ / / | | | | | | | | | With the option, assert_enqueued_jobs will check the number of times a specific kind of job is enqueued.
* | | Merge pull request #16640 from mfazekas/fix_loop_in_changed_for_autosaveGodfrey Chan2015-01-072-4/+21
|\ \ \ | | | | | | | | Fix potenital infinite recursion in changed_for_autosave?
| * | | Fix potenital stack level too deep with autosave or validationMiklos Fazkeas2015-01-042-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When associations checked for autosave have a cycle, and none of them is dirty, then changed_for_autosave? will be an infinite loop. We now remember if we're in the check and will short circuit the recursion.
* | | | Merge pull request #18377 from brainopia/custom_connection_with_countSean Griffin2015-01-072-1/+8
|\ \ \ \ | |_|_|/ |/| | | Fix count on a separate connection
| * | | Fix count on a separate connection (fixes #18359)brainopia2015-01-082-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previosly count and other AR calculations would convert column_name_for_operation to sql on a default Arel::Table.engine (AR::Base) connection. That could lead to trouble if current model has a connection to a different adapter or Base connection is inaccessible.
* | | | Merge pull request #18378 from ↵Carlos Antonio da Silva2015-01-072-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | shunsukeaida/avoid_orm_being_humanized_in_generator_help_message Overwrite descriptions generated by Generators::Base to respect acronym.
| * | | | acronyms like ORM should be in uppercase, so overwrite the desc generated by ↵shunsukeaida2015-01-072-2/+2
| | | | | | | | | | | | | | | | | | | | hook_for
* | | | | Move changelog entry to the top [ci skip]Carlos Antonio da Silva2015-01-071-7/+5
| |/ / / |/| | |
* | | | Merge pull request #18074 from caike/masterRafael Mendonça França2015-01-069-38/+58
|\ \ \ \ | |_|_|/ |/| | | Add _mailer suffix to generated file names.
| * | | Add mailer suffix to generated files and classesCarlos Souza2015-01-069-38/+58
| | | | | | | | | | | | | | | | | | | | Following the same naming convention used in controllers and jobs.
* | | | Use Ruby's #include? to avoid relying on AS extensionCarlos Antonio da Silva2015-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build has failed when running the date/time ext tests in isolation due to the missing extension, so better than adding a require is using just Ruby in this case. https://travis-ci.org/rails/rails/jobs/46107954#L1077
* | | | Merge pull request #18368 from kuldeepaggarwal/fix-attribute-scopeCarlos Antonio da Silva2015-01-061-3/+1
|\ \ \ \ | | | | | | | | | | fix `attribute` method scoping(i.e. private)
| * | | | fix `attribute` method scoping(i.e. private)Kuldeep Aggarwal2015-01-061-3/+1
| | | | | | | | | | | | | | | | | | | | ref #52f641264b1325a4c2bdce7971b14524bd4905f1
* | | | | Merge pull request #18370 from LindseyB/patch-1Guillermo Iguaran2015-01-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Changing sets -> set [ci-skip]
| * | | | | Changing sets -> set Lindsey Bieda2015-01-061-1/+1
|/ / / / / | | | | | | | | | | Updating some minor grammar issue.
* | | | | Merge pull request #18335 from georgeclaghorn/day-gymnasticsDavid Heinemeier Hansson2015-01-063-17/+151
|\ \ \ \ \ | |/ / / / |/| | | | Add #weekend?, #next_weekday, and #prev_weekday methods to Date, Time, and DateTime
| * | | | Add #prev_day and #next_day as counterparts to #yesterday and #tomorrow for ↵George Claghorn2015-01-063-6/+31
| | | | | | | | | | | | | | | | | | | | Date, Time, and DateTime
| * | | | Add same_time option to #prev_week and #next_week for Date, Time, and DateTimeGeorge Claghorn2015-01-063-17/+42
| | | | |
| * | | | Add #on_weekend?, #next_weekday, and #prev_weekday methods to Date, Time, ↵George Claghorn2015-01-063-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and DateTime `#on_weekend?` returns true if the receiving date/time falls on a Saturday or Sunday. `#next_weekday` returns a new date/time representing the next day that does not fall on a Saturday or Sunday. `#prev_weekday` returns a new date/time representing the previous day that does not fall on a Saturday or Sunday.
* | | | | Merge pull request #18366 from codeodor/patch-1Rafael Mendonça França2015-01-061-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Add log_level options to configuration guide
| * | | | Add log_level options to configuration guideSammy Larbi2015-01-061-1/+1
|/ / / /
* | | | Merge pull request #18362 from georgemillo/attributeRafael Mendonça França2015-01-061-3/+2
|\ \ \ \ | | | | | | | | | | replacing 'attribute' method with an alias
| * | | | replacing 'attribute' method with an aliasGeorge Millo2015-01-061-3/+2
| |/ / /
* | | | Merge pull request #18364 from prathamesh-sonpatki/ar-changelog-typosAbdelkader Boudih2015-01-061-5/+5
|\ \ \ \ | | | | | | | | | | Fixed typos and wording in ActiveRecord CHANGELOG [ci skip]
| * | | | Fixed typos and wording in ActiveRecord CHANGELOG [ci skip]Prathamesh Sonpatki2015-01-061-5/+5
|/ / / /
* | | | Merge pull request #18358 from ↵Yves Senn2015-01-064-1/+12
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | prathamesh-sonpatki/add-test-for-non-string-labeled-fixtures Fix lookup of fixtures with non-string(like Fixnum) label
| * | | Fix lookup of fixtures with non-string labelPrathamesh Sonpatki2015-01-064-1/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixtures with non-string labels such as integers should be accessed using integer label as key. For eg. pirates(1) or pirates(42). - But this results in NotFound error because the label is converted into string before looking up into the fixtures hash. - After this commit, the label is converted into string only if its a symbol. - This issue was fount out while adding a test case for https://github.com/rails/rails/commit/7b910917.
* | | Merge pull request #18354 from simi/improve-request-forgery-documentationDavid Heinemeier Hansson2015-01-051-3/+3
|\ \ \ | | | | | | | | Improve protect_from_forgery documentation.
| * | | Improve protect_from_forgery documentation. [ci skip].Josef Šimánek2015-01-061-3/+3
| | | |
* | | | Merge pull request #18356 from georgemillo/singularizeRafael Mendonça França2015-01-051-2/+2
|\ \ \ \ | | | | | | | | | | removing unecessary default parameter in private method
| * | | | removing unecessary parameter in private methodGeorge Millo2015-01-061-2/+2
| | | | | | | | | | | | | | | | | | | | '_singularize' only ever gets called with one argument
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-23 22:56:25 +0000