aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Check for protected environments before trying to load structure.sql filePrathamesh Sonpatki2016-04-101-1/+1
|/ / | | | | | | | | | | - Check for protected environments while running `db:structure:load` similar to how `db:schema:load` behaves. - Followup of https://github.com/rails/rails/pull/24399.
* | Merge pull request #23702 from namusyaka/fix-json-behaviorEileen M. Uchitelle2016-04-093-0/+15
|\ \ | | | | | | Fix behavior of JSON encoding for Exception
| * | Fix behavior of JSON encoding for Exceptionnamusyaka2016-04-093-0/+15
|/ /
* | Merge pull request #24165 from y-yagi/generate_application_job_when_not_existEileen M. Uchitelle2016-04-094-0/+39
|\ \ | | | | | | generate ApplicationJob if it does not already exist
| * | generate ApplicationJob if it does not already existyuuji.yaginuma2016-03-254-0/+39
| | | | | | | | | | | | | | | | | | ActiveJob jobs now inherit from ApplicationJob by default. However, when updating to Rails 5 from the old Rails, since there is a possibility that ApplicationJob does not exist.
* | | Merge pull request #24475 from jeremy/ar/mariadb-supports-datetime-precisionJeremy Daer2016-04-086-24/+56
|\ \ \ | | | | | | | | MariaDB 5.3+ supports microsecond datetime precision
| * | | Support microsecond datetime precision on MariaDB 5.3+.Jeremy Daer2016-04-086-24/+56
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | We support microsecond datetime precision for MySQL 5.6.4+. MariaDB has supported it since 5.3.0, but even 10.x versions return a compatible version string like `5.5.5-10.1.8-MariaDB-log` which we parse as 5.5.5, before MySQL supported microsecond precision. Specialize our version check to account for MariaDB to fix.
* | | Merge pull request #24457 from ↵Jeremy Daer2016-04-083-2/+40
|\ \ \ | | | | | | | | | | | | | | | | jeremy/mailer/dont-deliver-later-after-message-is-loaded Disallow calling `#deliver_later` after local message modifications.
| * | | Disallow calling `#deliver_later` after local message modifications.Jeremy Daer2016-04-073-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They would be lost when the delivery job is enqueued, otherwise. Prevents a common, hard-to-find bug like: ```ruby message = Notifier.welcome(user, foo) message.message_id = my_generated_message_id message.deliver_later ``` The message_id is silently lost here! *Only the mailer arguments are passed to the delivery job.* This raises an exception now. Make modifications to the message within the mailer method or use a custom Active Job to manage delivery instead of using #deliver_later.
* | | | Merge pull request #24474 from djunzu/fix_welcome_page_docsYves Senn2016-04-081-2/+1
|\ \ \ \ | | | | | | | | | | Remove reference to non existing link in the welcome page [ci skip]
| * | | | Remove reference to non existing link in the welcome page.djunzu2016-04-081-2/+1
|/ / / / | | | | | | | | | | | | modified: guides/source/getting_started.md
* | | | Merge pull request #24471 from swrobel/patch-1Rafael França2016-04-081-1/+2
|\ \ \ \ | | | | | | | | | | Clarify fixtures examples [ci skip]
| * | | | Clarify fixtures examples [ci skip]Stefan Wrobel2016-04-081-1/+2
|/ / / /
* | | | Merge pull request #24468 from RochesterinNYC/patch-2Rafael França2016-04-081-1/+1
|\ \ \ \ | | | | | | | | | | Clarify description of `include_all_helpers` config setting's default behavior [ci skip]
| * | | | Clarify description of `include_all_helpers` config setting's default ↵James Wen2016-04-081-1/+1
|/ / / / | | | | | | | | | | | | behavior [ci skip]
* | | | Merge pull request #24467 from javiervidal/20160409Yves Senn2016-04-081-1/+1
|\ \ \ \ | | | | | | | | | | Fix broken link in 'Ruby on Rails 3.1 Release Notes' [ci skip]
| * | | | Fix broken link in 'Ruby on Rails 3.1 Release Notes' [ci skip]Javier Vidal2016-04-081-1/+1
|/ / / /
* | | | Use new hash syntax (#24464)Jeroen Visser2016-04-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | * Updated syntax * Updated tests to match syntax
* | | | Merge pull request #24465 from y-yagi/remove_needless_entryVipul A M2016-04-082-9/+0
|\ \ \ \ | | | | | | | | | | remove needless entry [ci skip]
| * | | | remove needless entry [ci skip]yuuji.yaginuma2016-04-082-9/+0
| | | | | | | | | | | | | | | | | | | | The option backed to `start` in da26934313a31ae530b7537aba8a7662152f4dfe.
* | | | | Merge pull request #24461 from repinel/fix-etag-docsRafael França2016-04-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixes for the strong & weak ETags guide [ci skip]
| * | | | | Fixes for the strong & weak ETags guide [ci skip]Roque Pinel2016-04-071-1/+1
|/ / / / /
* | | | | Merge pull request #24458 from ↵Rafael França2016-04-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/remove_blank_line_generated_in_appliation_mailer remove blank line generated in application_mailer.rb
| * | | | | remove blank line generated in application_mailer.rbyuuji.yaginuma2016-04-081-1/+1
| |/ / / /
* | | | | Merge pull request #24335 from mabras/masterRafael França2016-04-071-2/+0
|\ \ \ \ \ | | | | | | | | | | | | remove unused `require`
| * | | | | remove unused requireMohamad Abras2016-03-291-2/+0
| | | | | |
* | | | | | Merge pull request #24453 from PareshGupta/validation-error-typoVipul A M2016-04-071-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Typo:- Fix length validation error [ci skip]
| * | | | | fix length validation error typoPareshGupta2016-04-071-1/+1
|/ / / / /
* | | | | Merge pull request #24422 from matthewd/extinguish-executor-exceptionsMatthew Draper2016-04-075-31/+200
|\ \ \ \ \ | | | | | | | | | | | | Clean up after a failure in a run callback
| * | | | | Directly support stateful executor hooksMatthew Draper2016-04-055-31/+200
| | | | | | | | | | | | | | | | | | | | | | | | Also, make sure to call the +complete+ hooks if +run+ fails.
* | | | | | Merge pull request #24399 from jch/protect-against-db-schema-load-in-productionRichard Schneeman2016-04-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Prevent db:schema:load to protected environments
| * | | | | | Prevent db:schema:load to protected environmentsJerry Cheung2016-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to https://github.com/rails/rails/pull/22967 to protect against loading a schema on accident in production. cc @schneems
* | | | | | | Merge pull request #24078 from kamipo/show_variablesRafael França2016-04-061-2/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Simply use `select_value` in `show_variable`
| * | | | | | | Simply use `select_value` in `show_variable`Ryuta Kamizono2016-03-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `SELECT @@name` statement returns only single row or `StatementInvalid`. ``` root@localhost [activerecord_unittest] > SELECT @@version; +-----------+ | @@version | +-----------+ | 5.7.9-log | +-----------+ 1 row in set (0.00 sec) root@localhost [activerecord_unittest] > SELECT @@unknown_variable; ERROR 1193 (HY000): Unknown system variable 'missing_variable' ```
* | | | | | | | Merge pull request #24374 from kamipo/move_quoting_methods_to_quoting_moduleRafael França2016-04-064-44/+38
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Move quoting methods to `Quoting` module
| * | | | | | | Make `QUOTED_TRUE` and `QUOTED_FALSE` to public because these are used in ↵Ryuta Kamizono2016-04-062-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `MysqlString`
| * | | | | | | Move `quoted_date`, `quote_string` and `quote_table_name_for_assignment` ↵Ryuta Kamizono2016-04-054-22/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods to `Quoting` module
| * | | | | | | Make to private `QUOTED_TRUE` and `QUOTED_FALSE` constantsRyuta Kamizono2016-04-052-18/+18
| | | | | | | |
* | | | | | | | Cable typo: isSupportedProtocol -> isProtocolSupportedJeremy Daer2016-04-051-1/+1
| | | | | | | |
* | | | | | | | Revert "Merge pull request #24440 from ↵Rafael Mendonça França2016-04-061-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yahonda/use_newer_version_of_sqlite3_at_travis_ci" This reverts commit a3d085a4ce949526cd388d6b399347504d9a0c92, reversing changes made to e2df1c6d2aa1dd667c6c1be25d5c7f7d69f293fa. It broke the build
* | | | | | | | Merge pull request #24431 from vipulnsward/24119-followupRafael França2016-04-061-0/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add test case for interpolation with passing of data along with record
| * | | | | | | | Add test case for interpolation with passing of data along with record ↵Vipul A M2016-04-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attribute in error message, where a proc is passed.
* | | | | | | | | Merge pull request #24444 from ↵Rafael França2016-04-062-4/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/update-message-proc-documentation Update example of passing a proc to `:message` option for validating records [ci skip]
| * | | | | | | | | Update example of passing a proc to `:message` option for validating records ↵Prathamesh Sonpatki2016-04-062-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] - This change is made as the behavior for `:message` proc was changed in https://github.com/rails/rails/pull/24119. - Also check https://github.com/rails/rails/pull/24431#issuecomment-206106790 for reference.
* | | | | | | | | | Fix Active Model basics introduction to indicate it only introduces us to ↵Rafael França2016-04-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration and not complete i18n framework. Fix Active Model basics introduction [ci skip]
| * | | | | | | | | Fix Active Model basics introduction to indicate it only introduces us to ↵Vipul A M2016-04-051-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration and not complete i18n framework. [ci skip]
* | | | | | | | | Fix undefined method `owners' for NullPreloader:ClassLadislav Smola2016-04-066-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix undefined method `owners' for NullPreloader:Class Fixing undefined method `owners' for ActiveRecord::Associations::Preloader::NullPreloader:Class * Use Ruby 1.9 hash format Use Ruby 1.9 hash format #24192 [Rafael Mendonça França + Ladislav Smola]
* | | | | | | | | Merge pull request #24436 from arktisklada/matching-sendmail-default-argumentsRafael França2016-04-063-2/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Sendmail default arguments match Mail::SendMail
| * | | | | | | | | Sendmail default arguments match Mail::SendMailarktisklada2016-04-053-2/+8
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Removes `-t`
* | | | | | | | | Merge pull request #24440 from yahonda/use_newer_version_of_sqlite3_at_travis_ciRafael França2016-04-061-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use SQLite3 3.7.15 which supports multiple values insert
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 06:46:58 +0000