aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | updated Inline format at activerecord rdocManish shrivastava2015-05-201-2/+2
|/ / / / / | | | | | | | | | | For Inline formats, changed ` (single backticks) to <tt> tag at active record rdoc as single backticks (`) don't work with rdoc. for inline format.
* | | | | Fix broken link for minitest. [ci skip]Arun Agrawal2015-05-201-1/+1
| | | | | | | | | | | | | | | For more details see #20222
* | | | | Merge pull request #20222 from Gaurav2728/gaurav-update_ruby_linksYves Senn2015-05-203-4/+4
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] updated ruby doc links; for rails next version of ruby will be 2.2x
| * | | | | [ci skip] update ruby doc links; for rails next version ruby 2.2+ will be ↵Gaurav Sharma2015-05-203-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | supported only
* | | | | | Merge pull request #20221 from Gaurav2728/gaurav-debugging_rails_guide_updateKasper Timm Hansen2015-05-201-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Rails 5.0 will target Ruby 2.2+, correct rails guide example [ci skip]
| * | | | | Rails 5.0 will target Ruby 2.2+, correct rails guide example [ci skip]Gaurav Sharma2015-05-201-1/+1
|/ / / / /
* | | | | Merge pull request #20219 from karanarora/Typo-fixSantiago Pastorino2015-05-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | typo fix [ci skip]
| * | | | | typo fix [ci skip]karanarora2015-05-201-1/+1
| | | | | |
* | | | | | add missing punctuation in changelog. [ci skip]Yves Senn2015-05-201-2/+2
| | | | | |
* | | | | | Merge pull request #20217 from amitsuroliya/fix_netaddr_linkArun Agrawal2015-05-201-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix NetAddr link [ci skip]
| * | | | | | Fix NetAddr link [ci skip]amitkumarsuroliya2015-05-201-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #20218 from ronakjangir47/postgresqlArun Agrawal2015-05-205-26/+26
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Updated postgresql documentation link to use latest version [ci skip]
| * | | | | Updated postgresql documentation link to use latest version [ci skip]Ronak Jangir2015-05-205-26/+26
|/ / / / /
* | | | | Merge pull request #20215 from repinel/validates_acceptance_docRichard Schneeman2015-05-191-0/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] add to doc that acceptance validator allows `nil` by default
| * | | | | [ci skip] add to doc that acceptance validator allows `nil` by defaultRoque Pinel2015-05-191-0/+1
| | | | | |
* | | | | | Fix docs markup for option_groups_from_collection_for_select [ci skip]Carlos Antonio da Silva2015-05-191-1/+1
|/ / / / /
* | | | | Give respond_to? a SymbolAkira Matsuda2015-05-201-1/+1
| | | | |
* | | | | Merge pull request #20213 from gouravtiwari/patch-8Rafael Mendonça França2015-05-191-2/+1
|\ \ \ \ \ | | | | | | | | | | | | updated squash docs-section [ci skip]
| * | | | | updated squash docs-section [ci skip]Gourav Tiwari2015-05-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I happen to squash my couple of commits and when followed steps from guide, I observed that I have to give a commit id after which I want to squash. If I don't provide one it picks last 3 commits, which might not include my commits to squash. Refer: http://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git
* | | | | | Small stylistic tweaks for `Delegator#try` patchGodfrey Chan2015-05-192-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rename `ActiveSupport::Try` => `ActiveSupport::Tryable` * Include the modules inline * `private` indentation
* | | | | | Patch `Delegator` to work with `#try`Nate Smith2015-05-193-17/+127
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Delegator` inherits from `BasicObject`, which means that it will not have `Object#try` defined. It will then delegate the call to the underlying object, which will not (necessarily) respond to the method defined in the enclosing `Delegator`. This patches `Delegator` with the `#try` method to work around the surprising behaviour. Fixes #5790
* | | | | parent_reflection should store only a reflection objectAaron Patterson2015-05-192-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | we should ask the reflection for its name rather than storing the reflection name in two places (an array and a reflection object)
* | | | | Merge pull request #20214 from kamipo/remove_unused_requireRafael Mendonça França2015-05-196-12/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused require
| * | | | | Remove unused already requireRyuta Kamizono2015-05-193-8/+0
| | | | | |
| * | | | | Remove `require 'arel/visitors/bind_visitor'`Ryuta Kamizono2015-05-193-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This line introduced by the commit fd398475 for using `Arel::Visitors::BindVisitor`. Currently it is not used.
* | | | | | Merge pull request #20207 from gouravtiwari/patch-7Rafael Mendonça França2015-05-191-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | doc changes for readability [ci skip]
| * | | | | | doc changes for readability [ci skip]Gourav Tiwari2015-05-191-2/+2
| |/ / / / /
* | | | | | Merge pull request #20157 from tak1n/masterRafael Mendonça França2015-05-191-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Clarify view tests
| * | | | | Clarify view tests [ci skip]Benjamin Klotz2015-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Mention that view tests are made in controller tests.
* | | | | | Merge pull request #20212 from kamipo/avoid_heredocRafael Mendonça França2015-05-191-20/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Avoid the heredoc in one line queries and simple queries
| * | | | | | Avoid the heredoc in one line queries and simple queriesRyuta Kamizono2015-05-191-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Related with #20028.
* | | | | | | Merge pull request #20211 from kamipo/refactor_statement_poolRafael Mendonça França2015-05-194-92/+36
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Eliminate the duplication code of `StatementPool`
| * | | | | | Eliminate the duplication code of `StatementPool`Ryuta Kamizono2015-05-194-92/+36
| | | | | | |
* | | | | | | Merge pull request #20210 from karanarora/Typo-fixRafael Mendonça França2015-05-191-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | spelling fix [ci skip]
| * | | | | | spelling fix [ci skip]karanarora2015-05-191-1/+1
|/ / / / / /
* | | | | | Merge pull request #20205 from ankit8898/security-guide-linkRafael Mendonça França2015-05-191-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | updating the security links, they were removed in cc30f5f9 [ci skip]
| * | | | | updating the links, they were removed in cc30f5f9 [ci skip]Ankit Gupta2015-05-191-0/+1
|/ / / / / | | | | | | | | | | | | | | | new links as per pull request comment #20160 (OWASP guides)
* | | | | Merge pull request #20201 from karanarora/Changelog-fixArun Agrawal2015-05-191-8/+8
|\ \ \ \ \ | | | | | | | | | | | | Fix typos is CHANGELOG [ci skip]
| * | | | | Fix typos is CHANGELOG [ci skip]karanarora2015-05-191-8/+8
|/ / / / /
* | | | | Only define #positive? and #negative? on Ruby 2.2Rafael Mendonça França2015-05-192-6/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The feature was accepted and added to Ruby 2.3+ so we don't need to define it again. See https://bugs.ruby-lang.org/issues/11151
* | | | | Merge pull request #20143 from vngrs/move_integer_positive_negative_to_numericRafael Mendonça França2015-05-195-14/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Move Integer#positive? and Integer#negative? query methods to Numeric
| * | | | | Move Integer#positive? and Integer#negative? query methods to Numeric classMehmet Emin İNAÇ2015-05-136-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | By this way Integer, Rational, Float, Fixnum, Bignum classes have the same behaviour
* | | | | | Merge pull request #20195 from tgxworld/fix_grammarRafael Mendonça França2015-05-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix grammar. [CI SKIP]
| * | | | | | Fix grammar. [CI SKIP]Guo Xiang Tan2015-05-191-1/+1
|/ / / / / /
* | | | | | Merge pull request #20175 from eugeneius/copy_schema_cache_after_forkRafael Mendonça França2015-05-183-24/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add schema cache to new connection pool after fork
| * | | | | | Add schema cache to new connection pool after forkEugene Kenny2015-05-173-24/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Active Record detects when the process has forked and automatically creates a new connection pool to avoid sharing file descriptors. If the existing connection pool had a schema cache associated with it, the new pool should copy it to avoid unnecessarily querying the database for its schema. The code to detect that the process has forked is in ConnectionHandler, but the existing test for it was in the ConnectionManagement test file. I moved it to the right place while I was writing the new test for this change.
* | | | | | | Prefer assert_not over refuteRafael Mendonça França2015-05-182-2/+2
| | | | | | |
* | | | | | | Merge pull request #20191 from juggernaut-/patch-1Rafael Mendonça França2015-05-183-0/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added ActionDispatch::Journey::Routes#empty?
| * | | | | | | ActionDispatch::Journey::Routes#empty? test casesValentine Valyaeff2015-05-193-1/+17
| | | | | | | |
| * | | | | | | Added ActionDispatch::Journey::Routes#empty?juggernaut-2015-05-181-0/+4
| | | | | | | |