aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | |
* | | | | Merge pull request #20187 from yui-knk/refactor/type_intRafael Mendonça França2015-05-181-3/+6
|\ \ \ \ \ | | | | | | | | | | | | Refactoring `ActiveRecord::Type::Integer` limit
| * | | | | Refactoring `ActiveRecord::Type::Integer` limityui-knk2015-05-181-3/+6
| | | | | |
* | | | | | Merge pull request #20192 from kamipo/divide_to_column_options_handling_methodsRafael Mendonça França2015-05-182-10/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | Divide methods for handling column options separately
| * | | | | | Divide methods for handling column options separatelyRyuta Kamizono2015-05-182-10/+34
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #20190 from kamipo/fix_serial_with_quoted_sequence_nameRafael Mendonça França2015-05-182-1/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix `serial?` with quoted sequence name
| * | | | | Fix `serial?` with quoted sequence nameRyuta Kamizono2015-05-182-1/+10
| |/ / / /
* | | | | Merge pull request #20082 from sh6khan/nested-attributes-docsEileen M. Uchitelle2015-05-181-0/+5
|\ \ \ \ \ | | | | | | | | | | | | docs for updating nested attributes while creating parent record
| * | | | | docs for updating nested attributes while creating parent record [cish6khan2015-05-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | skip]
* | | | | | sqlite3_mem has an existing connectionMatthew Draper2015-05-181-1/+3
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | We must account for receiving one less call to #new_connection, but the test otherwise remains valid.
* | | | | better `add_reference` documentation. [ci skip]Yves Senn2015-05-182-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch - reduces the duplication among the `reference`-family methods. - better explains all the optians available for `add_reference`. - redirects to user from `references` to `add_reference`. Originated by #20184.
* | | | | Merge pull request #20182 from repinel/remove-assigns-from-api-doc1Yves Senn2015-05-181-2/+2
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] remove `assigns` from the integration test example in API docs
| * | | | | [ci skip] remove `assigns` from the integration test example in API docsRoque Pinel2015-05-171-2/+2
|/ / / / / | | | | | | | | | | | | | | | Based on #19976 and #18305.
* | | | | Merge pull request #20178 from ↵Santiago Pastorino2015-05-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vngrs/fix_wrong_default_value_of_javascript_engine config.generators javascript_engine default value is :js not nil
| * | | | | config.generators javascript_engine default value is :js not nil [ci skip]Mehmet Emin İNAÇ2015-05-171-1/+1
| | | | | |
* | | | | | Merge pull request #20179 from gouravtiwari/patch-5Santiago Pastorino2015-05-171-5/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | formatting changes for mail options
| * | | | | | formatting changes [ci skip]Gourav Tiwari2015-05-171-5/+6
| |/ / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 02:01:16 +0000