aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Enable gzip compression by defaultschneems2014-08-207-16/+76
| | | | | | If someone is using ActionDispatch::Static to serve assets and makes it past the `match?` then the file exists on disk and it will be served. This PR adds in logic that checks to see if the file being served is already compressed (via gzip) and on disk, if it is it will be served as long as the client can handle gzip encoding. If not, then a non gzip file will be served. This additional logic slows down an individual asset request but should speed up the consumer experience as compressed files are served and production applications should be delivered with a CDN. This PR allows a CDN to cache a gzip file by setting the `Vary` header appropriately. In net this should speed up a production application that are using Rails as an origin for a CDN. Non-asset request speed is not affected in this PR.
* Merge pull request #16600 from bradly/spelling-fix-in-testing-guideZachary Scott2014-08-201-1/+1
|\ | | | | [ci skip] Fixing spelling typo in testing guide.
| * [ci skip] Fixing spelling typo in testing guide.Bradly Feeley2014-08-201-1/+1
|/
* "warning: assigned but unused variable"Akira Matsuda2014-08-211-1/+1
|
* Fix SyntaxErrorAkira Matsuda2014-08-211-1/+1
|
* Merge pull request #16597 from teeparham/masterZachary Scott2014-08-201-2/+0
|\ | | | | | | | | Remove cached attributes from Configuring guide [ci skip] This was removed in #15429
| * Update configuring.md [ci skip]Tee Parham2014-08-201-2/+0
|/ | | Remove ActiveRecord config instructions for active_record.attribute_types_cached_by_default, which was removed in https://github.com/rails/rails/commit/66736c8e50585
* Make the explicit the Active Job dependency of Action MailerRafael Mendonça França2014-08-201-0/+1
|
* Remove timestamp type from generator usageRafael Mendonça França2014-08-201-1/+0
| | | | It was soft removed at 03035d69e14032a589e9653e3145237b8a9a09be
* Merge pull request #16594 from loganhasson/masterZachary Scott2014-08-202-2/+2
|\ | | | | [ci skip] Fix Active Job grammar in api docs
| * [ci skip] Fix Active Job grammar in api docsLogan Hasson2014-08-202-2/+2
| |
* | Merge pull request #16593 from aditya-kapoor/add-doc-for-stepZachary Scott2014-08-201-3/+6
|\ \ | | | | | | [ci skip] add doc for STEP in migration
| * | [ci skip] add doc for STEP in migrationAditya Kapoor2014-08-211-3/+6
| |/
* | Merge pull request #16575 from tomkadwill/added_has_many_scope_documentationZachary Scott2014-08-201-0/+11
|\ \ | |/ |/| [ci skip] Added documentation for has_many scope parameter
| * [ci skip] Added documentation for has_many scope parameterTom Kadwill2014-08-201-0/+11
| |
* | Merge pull request #16592 from aditya-kapoor/fix-migration-docsSantiago Pastorino2014-08-201-9/+2
|\ \ | | | | | | [ci skip] correct docs about the migration generation
| * | [ci skip] correct docs about the migration generationAditya Kapoor2014-08-211-9/+2
| | |
* | | Merge pull request #16590 from loganhasson/masterZachary Scott2014-08-201-8/+8
|\ \ \ | |/ / |/| | [ci skip] Fix typos/grammar in Active Job guide
| * | Fix a few typos/some grammar in Active Job BasicsLogan Hasson2014-08-201-8/+8
|/ /
* | Same as f39cb2b except backport friendlyZachary Scott2014-08-201-1/+4
| | | | | | | | Point release notes to stable branch for list of commits. [ci skip]
* | Same as f39cb2b except backport friendlyZachary Scott2014-08-201-4/+4
| | | | | | | | Point release notes to stable branch for list of commits. [ci skip]
* | Point release notes to stable branch for list of commits. [ci skip]Zachary Scott2014-08-206-9/+15
| |
* | Merge pull request #16587 from seuros/masterRafael Mendonça França2014-08-202-16/+16
|\ \ | | | | | | [Rdoc] Make clear that we are sending an AR object [ci skip]
| * | [Rdoc] Make clear that we are sending an AR object [ci skip]Abdelkader Boudih2014-08-202-16/+16
|/ /
* | Merge pull request #16172 from Agis-/hmt_scope_arityRafael Mendonça França2014-08-206-1/+29
|\ \ | | | | | | has_many :through with dynamic condition merging
| * | Only merge scopes with zero arity in has_many throughAgis-2014-08-206-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with dynamic conditions. Fixes #16128 This bug was introduced in https://github.com/rails/rails/commit/c35e438620f2d56562251571377995359546393d so it's present from 4.1.2-rc1 and after. https://github.com/rails/rails/commit/c35e438620f2d56562251571377995359546393d merges any relation scopes passed as proc objects to the relation, but does *not* take into account the arity of the lambda. To reproduce: https://gist.github.com/Agis-/5f1f0d664d2cd08dfb9b
* | | Merge pull request #16586 from seuros/masterRafael Mendonça França2014-08-202-16/+16
|\ \ \ | | | | | | | | Fix typo in rdoc [ci skip]
| * | | Fix typo in rdoc [ci skip]Abdelkader Boudih2014-08-202-16/+16
|/ / /
* | | Merge pull request #16582 from cristianbica/actionmailer-deprecate-deliverRafael Mendonça França2014-08-2019-101/+227
|\ \ \ | | | | | | | | Deprecated ActionMailer .deliver and updated ActionMailer / ActiveJob docs/guide
| * | | Updated rdoc / guides / release notes related to ActiveJob / ActionMailerCristian Bica2014-08-2011-54/+141
| | | |
| * | | Deprecated .deliver / .deliver! to .deliver_now / .deliver_now!Cristian Bica2014-08-209-53/+92
| | | |
* | | | Merge pull request #16585 from nicolasblanco/require_active_jobRafael Mendonça França2014-08-202-0/+2
|\ \ \ \ | | | | | | | | | | Require ActiveJob in case a skip_xxx option is given
| * | | | Require ActiveJob in case a skip_xxx option is givenslainer682014-08-202-0/+2
| | | | | | | | | | | | | | | | | | | | Change position of require active_job
* | | | | Merge pull request #16583 from JuanitoFatas/doc/patch-1Rafael Mendonça França2014-08-201-16/+22
|\ \ \ \ \ | |_|/ / / |/| | | | [ci skip] Format pass of Active Job Basics guide.
| * | | | [ci skip] Format pass of Active Job Basics guide.Juanito Fatas2014-08-201-16/+22
| | | | |
* | | | | Fixes the digits counter of AS's NumberToRoundedConverterXavier Noria2014-08-202-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Zero has one digit, but Math.log10(0) returns -Infinity. The method needs to special-case zero. The patch adds a regression test that is not clearly related to the underlying issue because digit_count is private and has no coverage. Gray area. This bug was uncovered by 60062cf.
* | | | | Merge pull request #16145 from phoet/patch-2Rafael Mendonça França2014-08-202-10/+15
|\ \ \ \ \ | |_|/ / / |/| | | | don't log errors when all is fine
| * | | | don't log errors when all is finePeter Schröder2014-07-172-10/+15
| | | | |
* | | | | Merge pull request #16573 from zzak/test_test_to_test_case_testSantiago Pastorino2014-08-201-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Move as/test_test to as/test_case_test
| * | | | | Move as/test_test to as/test_case_testZachary Scott2014-08-191-0/+0
| | | | | |
* | | | | | Merge pull request #16581 from JuanitoFatas/guides-anchor-linkXavier Noria2014-08-202-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Revert "Do not gsub non ASCII characters in header anchor.".
| * | | | | Revert "Do not gsub non ASCII characters in header anchor.".Juanito Fatas2014-08-202-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 699babe. Also change the upgrading_ruby_on_rails link back to original in 4_2_release_notes.
* | | | | Merge pull request #16577 from cristianbica/update-deprecation-to-5.0Matthew Draper2014-08-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Updated the deprecation warnings to 5.0
| * | | | | Updated the deprecation warnings to 5.0Cristian Bica2014-08-201-1/+1
| | |_|_|/ | |/| | |
* | | | | Clear deliveries in order not to affect other testsAkira Matsuda2014-08-201-2/+4
| | | | |
* | | | | Merge pull request #16579 from nsinenko/masterXavier Noria2014-08-202-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Remove end-of-line spacing in development.rb, production.rb
| * | | | | remove end-of-line spacing in development.rb, production.rbNick Sinenko2014-08-202-2/+2
|/ / / / /
* / / / / Ignore Postgresql "SELECT tablename FROM pg_tables" when counting queriesAkira Matsuda2014-08-201-1/+1
|/ / / /
* / / / Add documentation intro to example for `Object#itself`.Zachary Scott2014-08-191-2/+5
|/ / / | | | | | | | | | | | | Also moved comment for removal above `unless()` to not confuse RDoc with the documentation for this method.
* | | [ci skip] "..enables interrorgating of [thing].." would be correctZachary Scott2014-08-191-1/+1
| | |