aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | | Use SQLite3 3.7.15 which supports multiple values insertYasuo Honda2016-04-051-0/+5
| | | | | | | |
* | | | | | | | Merge pull request #24433 from kamipo/avoid_unused_captureRafael França2016-04-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Avoid unused capture
| * | | | | | | | Avoid unused captureRyuta Kamizono2016-04-051-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #24441 from harsimranmaan/patch-1Rafael França2016-04-051-3/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Remove hard-coded backticks in SQL statements
| * | | | | | | Remove hard-coded backticks in SQL statementsHarsimran Singh Maan2016-04-051-3/+3
|/ / / / / / / | | | | | | | | | | | | | | The hard-coded back-ticks made it hard to use a different char for quoting db fields. This checkin replaces it with quote_table_name.
* | | | | | | Merge pull request #24224 from danielrhodes/actioncable-websocket-protocolsJeremy Daer2016-04-059-24/+93
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ActionCable protocol negotiation
| * | | | | | | Added protocol negotiationDaniel Rhodes2016-04-058-24/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is primarily for backwards compatibility for when or if the protocol is changed in future versions. If the server fails to respond with an acceptable protocol, the client disconnects and disables the monitor.
* | | | | | | | quick edits on the AC::API RDoc [ci skip]Xavier Noria2016-04-051-19/+20
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, the fact that ApplicationController is the only one inheriting from AC::API is not a default. You could say at most that generators generate them that way, but the creation of controllers is something which is out of our control because programmers write controllers by hand. Instead, we can say that normally, conventionally, as in the majority of Rails apps, that is the actually the case.
* | | | | | | Merge pull request #24419 from rgm/masterEileen M. Uchitelle2016-04-052-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Extend `ActionController::TestCase` deprecation warning
| * | | | | | | it's => its typoRyan McCuaig2016-04-042-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #24410 from mechanicles/strong-weak-etags-infoप्रथमेश Sonpatki2016-04-051-3/+29
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Update documentation based on the new changes for strong & weak ETags.
| * | | | | | | Update documentation based on the new changes for strong & weak ETags [ci skip]Santosh Wadghule2016-04-051-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update info for weak ETag - Add info for strong ETag - Add examples for strong and weak ETags - Display difference between generated strong and weak ETags strings.
* | | | | | | | Merge pull request #24119 from prathamesh-sonpatki/proc-messagesRafael França2016-04-053-1/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Allow passing record being validated to error message generator
| * | | | | | | | Allow passing record being validated to error message generatorPrathamesh Sonpatki2016-04-053-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Pass object to I18n helper so that when calling message proc, it will pass that object as argument to the proc and we can generate custom error messages based on current record being validated. - Based on https://github.com/rails/rails/issues/856. [Łukasz Bandzarewicz, Prathamesh Sonpatki]
* | | | | | | | | Merge pull request #24429 from vipulnsward/24401-docsRafael França2016-04-051-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Guides changes, follow up of #24401 [ci skip]
| * | | | | | | | Guides changes, follow up of #24401Vipul A M2016-04-051-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #24345 from ↵Rafael França2016-04-052-4/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtsmfm/fix-marshal-with-autoloading-for-nested-class Fix marshal with autoloading for nested class/module
| * | | | | | | | Fix marshal with autoloading for nested class/moduleFumiaki MATSUSHIMA2016-03-282-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #24150 break autoloading for nested class/module. There is test for nested class but it doesn't work correctly. Following code will autoload `ClassFolder::ClassFolderSubclass` before `Marshal.load`: `assert_kind_of ClassFolder::ClassFolderSubclass, Marshal.load(dumped)`
* | | | | | | | | Merge pull request #24401 from pan/number-to-phoneRafael Mendonça França2016-04-055-4/+36
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | `number_to_phone` formats number with regexp
| * | | | | | | | `number_to_phone` formats number with regexpPan GaoYong2016-04-025-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, this method formats US number. This commit extends its functionality to format number for other countries with a custom regular expression. number_to_phone(18812345678, pattern: /(\d{3})(\d{4})(\d{4})/) # => 188-1234-5678 The output phone number is divided into three groups, so the regexp should also match three groups of numbers.
* | | | | | | | | Merge pull request #24426 from yui-knk/refactor_mysql2Rafael França2016-04-042-6/+16
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Use `QUOTED_TRUE` and `QUOTED_FALSE` instead of magic strings
| * | | | | | | | Use `QUOTED_TRUE` and `QUOTED_FALSE` instead of magic stringsyui-knk2016-04-052-6/+16
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we define `QUOTED_TRUE` as `"1"` and `QUOTED_FALSE` as `"0"`. And add test cases to ensure this commit does not break current behavior even if the value of `attributes_before_type_cast` is false.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 18:27:46 +0000