aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | - Fence some commands, options, gems, etc. with quotesVipul A M2016-04-101-18/+18
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added missing config to complete config names - Fixed route generators changelog grammar. - rake:stats => rake stats - Fixed grammar of assert_file change - Make sure we end all sentences [ci skip]
* | | | | | | Merge pull request #24490 from ↵Santiago Pastorino2016-04-111-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/add-config-to-deprecation-warning Add `config` to the deprecation warnings of deprecated config options
| * | | | | | | Add `config` to the deprecation warnings of deprecated config optionsPrathamesh Sonpatki2016-04-101-3/+3
| | | | | | | |
* | | | | | | | Merge pull request #24511 from lihanli/activemodel-dirty-attribute-changedJeremy Daer2016-04-111-3/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | speed up ActiveModel::Dirty#attribute_changed?
| * | | | | | | | set default parameter to nil to speed up attribute_changed?Lihan Li2016-04-111-3/+5
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Benchmark results: Warming up -------------------------------------- old code 32.176k i/100ms new code 34.837k i/100ms Calculating ------------------------------------- old code 1.595M (± 3.5%) i/s - 7.947M new code 1.942M (± 3.9%) i/s - 9.685M
* | | | | | | | Merge pull request #24504 from nickmalcolm/masterVipul A M2016-04-121-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Encourage best practice in the HTTP Token authentication example code
| * | | | | | | | [ci skip] This modifies the HTTP Token authentication example's ↵Nick Malcolm2016-04-121-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `authenticate` method, to use the `secure_compare` method with two constant-length strings. This defends against timing attacks, and is best practice. Using `==` for sensitive actions is not recommended, and this was the source of a CVE fixed in October 2015: https://github.com/rails/rails/commit/17e6f1507b7f2c2a883c180f4f9548445d6dfbda
* | | | | | | | | Merge pull request #24492 from vipulnsward/pass-over-warningsJeremy Daer2016-04-1114-20/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Clean up all Rails 5 warnings. Revert auto-added periods.
| * | | | | | | | | Pass over all Rails 5 warnings, to make sure:Vipul A M2016-04-1214-20/+19
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - we are ending sentences properly - fixing of space issues - fixed continuity issues in some sentences. Reverts https://github.com/rails/rails/commit/8fc97d198ef31c1d7a4b9b849b96fc08a667fb02 . This change reverts making sure we add '.' at end of deprecation sentences. This is to keep sentences within Rails itself consistent and with a '.' at the end.
* | | | | | | | | Merge pull request #24508 from alexmirk/masterVipul A M2016-04-121-5/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Improved ActionView flows.rb documention [ci skip]
| * | | | | | | | | Improved ActionView flows.rb documention [ci skip]Alex Mirkhaydarov2016-04-111-5/+4
|/ / / / / / / / /
* | | / / / / / / edit pass over the RDoc of Rails::Railtie [ci skip]Xavier Noria2016-04-111-36/+36
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pass touches a few minor things. One important aspect is that the wording treats "railtie" as a regular noun. This is so because Railtie is a constant and generally the text refers to "classes that act as railties", which is different. Railties are so fundamental in Rails that deserve a noun, like engine, class, array, application, etc. They have a meaning per se, beyond constants. Also, make clear an extension's railtie does not need to be called "Railtie" or have "Railtie" in their class name.
* | | | | | | | remove explicit curlies for hash argumentXavier Noria2016-04-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Idiomatically trailing hashes in method calls do not use explicit curlies.
* | | | | | | | Merge pull request #24485 from ↵Richard Schneeman2016-04-111-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/protected_database_env_message Cleanup message shown while running destructive action against protected database
| * | | | | | | | Cleanup message shown while running destructive action against protected ↵Prathamesh Sonpatki2016-04-101-2/+2
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | database.
* | | | | | | | Merge pull request #24497 from vipulnsward/am-changelog-passYves Senn2016-04-111-4/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Pass over AM changelog [ci skip]
| * | | | | | | | Pass over AM changelogVipul A M2016-04-101-4/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed statement about setting `config.action_mailer.default_url_options = {protocol: 'https'}` . We are just setting the protocol key to 'https', not replacing/initializing the complete config. - Fixed grammar in assert_emails changlog - Added sentence separator for code ":" [ci skip]
* | | | | | | | issue FileUtils commands directly in Rake tasksXavier Noria2016-04-114-15/+12
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Rake includes (an extended version of) FileUtils in tasks. It is more idiomatic that they use this provided interface.
* | | | | | | revises fileutils dependencies in railtiesXavier Noria2016-04-118-4/+13
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the exception of what is loaded in active_support/rails, each file is responsible for its own dependencies. You cannot rely on runtime order of execution.
* | | | | | Merge pull request #24487 from tomkadwill/action-mailer-base-docsVipul A M2016-04-101-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Update ActionMailer Mailer Models and Views documentation [ci skip]
| * | | | | Update ActionMailer Views documentation [ci skip]Tom Kadwill2016-04-101-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #24486 from y-yagi/do_not_create_unnecessary_directoryRafael França2016-04-102-5/+2
|\ \ \ \ \ | |_|/ / / |/| | | | do not create unnecessary directory
| * | | | do not create unnecessary directoryyuuji.yaginuma2016-04-102-5/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | This was added in a4c358f, but `config.assets` has been removed in 5172d93. Also, do not use env path to `Sprockets::Cache::FileStore` even `sprockets-rails`. ref: https://github.com/rails/sprockets-rails/blob/master/lib/sprockets/railtie.rb#L129
* | | | Merge pull request #24488 from y-yagi/fix_file_pathAbdelkader Boudih2016-04-101-4/+4
|\ \ \ \ | | | | | | | | | | fix typo in file path [ci skip]
| * | | | fix typo in file path [ci skip]yuuji.yaginuma2016-04-101-4/+4
| |/ / /
* | | | Merge pull request #24484 from prathamesh-sonpatki/protecte_structure_load_tooRichard Schneeman2016-04-101-1/+1
|\ \ \ \ | |/ / / |/| | | Check for protected environments before trying to load structure.sql file
| * | | 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
| |/ / / / /