aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24525 from tomkadwill/action-mailer-base-docs2Vipul A M2016-04-141-3/+3
|\ | | | | Update ActionMailer base documentation [ci skip]
| * Update ActionMailer base documentation [ci skip]Tom Kadwill2016-04-131-3/+3
| |
* | Merge pull request #24539 from bogdan/diry-keyword-argsSean Griffin2016-04-131-1/+1
|\ \ | | | | | | Fixed bug introduced in #24519. Makes build green again
| * | Fixed bug introduced in #24519. Makes build green againBogdan Gusiev2016-04-131-1/+1
| | |
* | | Merge pull request #24536 from vipulnsward/ruby-2-upgradingRafael França2016-04-131-1/+2
|\ \ \ | |/ / |/| | Add ruby 2.2.2+ version requirement for Rails 5 apps
| * | Add ruby 2.2.2+ version requirement for Rails 5 appsVipul A M2016-04-131-1/+2
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #24519 from bogdan/diry-keyword-argsJeremy Daer2016-04-131-8/+8
|\ \ \ | | | | | | | | Switch to keyword args for attribute_changed?
| * | | Use keyword arguments to cleanup without droping performanceBogdan Gusiev2016-04-131-8/+8
| | | |
* | | | Properly serialize all JSON primitives in the AR JSON typeSean Griffin2016-04-134-14/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were assuming that the only valid types for encoding were arrays and hashes. However, any JSON primitive is an accepted value by both PG and MySQL. This does involve a minor breaking change in the handling of `default` in the schema dumper. This is easily worked around, as passing a hash/array literal would have worked fine in previous versions of Rails. However, because of this, I will not be backporting this to 4.2 or earlier. Fixes #24234
* | | | Remove unused variableRafael Mendonça França2016-04-131-1/+0
| | | |
* | | | Remove time calculatiosn extensionRafael Mendonça França2016-04-131-0/+2
| | | | | | | | | | | | | | | | We are using compare_without_coercion.
* | | | Merge pull request #24318 from bogdanvlviv/patch-1Rafael Mendonça França2016-04-122-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | extension synonyms yml and yaml
| * | | | extension synonyms yml and yamlBogdan2016-03-272-1/+5
| | | | |
* | | | | Merge pull request #24524 from prathamesh-sonpatki/cablejs-for-channelsRafael França2016-04-123-0/+22
|\ \ \ \ \ | |_|/ / / |/| | | | Generate `cable.js` file if does not exist when generating channel
| * | | | Generate `cable.js` file if does not exist when generating channelPrathamesh Sonpatki2016-04-123-0/+22
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Before this, while generating a channel, we were not creating `cable.js` if it does not already exist. - We have similar code for application mailer here - https://github.com/rails/rails/commit/0b3ae023d27197417541932632055cd6be4810c4. - Based on the comment - https://github.com/rails/rails/issues/24418#issuecomment-205421995.
* | | | Merge pull request #24515 from Sen-Zhang/attribute_changed_not_return_nilSean Griffin2016-04-122-3/+3
|\ \ \ \ | | | | | | | | | | prevent 'attribute_changed?' from returning nil
| * | | | prevent 'attribute_changed?' from returning nilSen-Zhang2016-04-112-3/+3
| |/ / /
* | | | Merge pull request #24502 from ankit8898/freezing-dot-in-delimiter-helperRichard Schneeman2016-04-122-4/+6
|\ \ \ \ | | | | | | | | | | Lesser '.' objects for number helpers
| * | | | Freezing couple of more string '0' & '.' and using the string appending to ↵Ankit Gupta2016-04-111-2/+4
| | | | | | | | | | | | | | | | | | | | do the same string manipulation. This was we avoid the duplicate strings with freeze and append modifies existing string
| * | | | Freezing the dots as they are causing extra string initialization on every ↵Ankit Gupta2016-04-102-2/+2
| | | | | | | | | | | | | | | | | | | | iteration of calling the helper. Eases on some memory bloat
* | | | | copy edits some comments [ci skip]Xavier Noria2016-04-121-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that the fact that mtimes in the future are ignore was documented just a few lines above. Since we know this has to be done, and the code is quite clear due to variable naming, I think we can get rid of the comment in the middle of the loop and shorten it even further.
* | | | | Merge pull request #24494 from vipulnsward/guides-changelog-passYves Senn2016-04-121-8/+15
|\ \ \ \ \ | | | | | | | | | | | | Guides changelog pass [ci skip]
| * | | | | - Add changelog for new guide: AC overview from ↵Vipul A M2016-04-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/pull/23176 [ci skip]
| * | | | | - Fixed changelog related to i18 key changes. Added authorVipul A M2016-04-101-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Made all sentences to end properly [ci skip]
* | | | | | Merge pull request #24523 from BlakeMesdag/as-max_time-fix-edgesXavier Noria2016-04-122-7/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | Handle max_time edge cases for epoch times and add test
| * | | | | | No more need for an early returnBlake Mesdag2016-04-121-2/+0
| | | | | | |
| * | | | | | More readable versionBlake Mesdag2016-04-121-13/+10
| | | | | | |
| * | | | | | Handle max_time edge cases for epoch times and add testBlake Mesdag2016-04-122-3/+29
| | | | | | |
* | | | | | | Allow symbols using "dot notation" to be passed to whereSean Griffin2016-04-124-7/+12
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 04ac5655be91f49cd4dfe2838df96213502fb274 I assumed that we would never want to pass the "table_name.column_name" form to where with a symbol. However, in Ruby 2.2 and later, you can quote symbols using the new hash syntax, so it's a semi-reasonable thing to do if we want to support the dot notation (which I'd rather deprecate, but that would be too painful of a migration). Instead we've changed the definition of "this is a table name with a dot" to when the value associated is a hash. It would make very little sense to write `where("table_name.column_name": { foo: :bar })` in any scenario (other than equality for a JSON column which we don't support through `where` in this way). Close #24514.
* | | | | | Merge pull request #24520 from ↵Xavier Noria2016-04-121-1/+17
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | BlakeMesdag/activesupport-fileupdate-checker-mtime-optimization Use a single loop in ActiveSupport:FileUpdateChecker#max_mtime
| * | | | | Use Time#compare_without_coercion for super speedBlake Mesdag2016-04-121-1/+6
| | | | | |
| * | | | | Use a single memoized loop to find max mtime in ↵Blake Mesdag2016-04-121-1/+12
|/ / / / / | | | | | | | | | | | | | | | ActiveSupport::FileUpdateChecker#max_mtime
* | | | | Merge pull request #24495 from vipulnsward/rails-changelog-passSantiago Pastorino2016-04-111-18/+18
|\ \ \ \ \ | | | | | | | | | | | | Railties CHANGELOG Pass [ci skip]
| * | | | | - 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]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 16:45:31 +0000