Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix docs markup for option_groups_from_collection_for_select [ci skip] | Carlos Antonio da Silva | 2015-05-19 | 1 | -1/+1 |
| | |||||
* | Give respond_to? a Symbol | Akira Matsuda | 2015-05-20 | 1 | -1/+1 |
| | |||||
* | Merge pull request #20213 from gouravtiwari/patch-8 | Rafael Mendonça França | 2015-05-19 | 1 | -2/+1 |
|\ | | | | | updated squash docs-section [ci skip] | ||||
| * | updated squash docs-section [ci skip] | Gourav Tiwari | 2015-05-19 | 1 | -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` patch | Godfrey Chan | 2015-05-19 | 2 | -20/+20 |
| | | | | | | | | | | | | * Rename `ActiveSupport::Try` => `ActiveSupport::Tryable` * Include the modules inline * `private` indentation | ||||
* | | Patch `Delegator` to work with `#try` | Nate Smith | 2015-05-19 | 3 | -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 object | Aaron Patterson | 2015-05-19 | 2 | -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_require | Rafael Mendonça França | 2015-05-19 | 6 | -12/+0 |
|\ | | | | | Remove unused require | ||||
| * | Remove unused already require | Ryuta Kamizono | 2015-05-19 | 3 | -8/+0 |
| | | |||||
| * | Remove `require 'arel/visitors/bind_visitor'` | Ryuta Kamizono | 2015-05-19 | 3 | -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-7 | Rafael Mendonça França | 2015-05-19 | 1 | -2/+2 |
|\ \ | | | | | | | doc changes for readability [ci skip] | ||||
| * | | doc changes for readability [ci skip] | Gourav Tiwari | 2015-05-19 | 1 | -2/+2 |
| |/ | |||||
* | | Merge pull request #20157 from tak1n/master | Rafael Mendonça França | 2015-05-19 | 1 | -1/+1 |
|\ \ | |/ |/| | Clarify view tests | ||||
| * | Clarify view tests [ci skip] | Benjamin Klotz | 2015-05-14 | 1 | -1/+1 |
| | | | | | | | | Mention that view tests are made in controller tests. | ||||
* | | Merge pull request #20212 from kamipo/avoid_heredoc | Rafael Mendonça França | 2015-05-19 | 1 | -20/+5 |
|\ \ | | | | | | | Avoid the heredoc in one line queries and simple queries | ||||
| * | | Avoid the heredoc in one line queries and simple queries | Ryuta Kamizono | 2015-05-19 | 1 | -20/+5 |
| | | | | | | | | | | | | Related with #20028. | ||||
* | | | Merge pull request #20211 from kamipo/refactor_statement_pool | Rafael Mendonça França | 2015-05-19 | 4 | -92/+36 |
|\ \ \ | | | | | | | | | Eliminate the duplication code of `StatementPool` | ||||
| * | | | Eliminate the duplication code of `StatementPool` | Ryuta Kamizono | 2015-05-19 | 4 | -92/+36 |
| | | | | |||||
* | | | | Merge pull request #20210 from karanarora/Typo-fix | Rafael Mendonça França | 2015-05-19 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | spelling fix [ci skip] | ||||
| * | | | spelling fix [ci skip] | karanarora | 2015-05-19 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #20205 from ankit8898/security-guide-link | Rafael Mendonça França | 2015-05-19 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | updating the security links, they were removed in cc30f5f9 [ci skip] | ||||
| * | | updating the links, they were removed in cc30f5f9 [ci skip] | Ankit Gupta | 2015-05-19 | 1 | -0/+1 |
|/ / | | | | | | | new links as per pull request comment #20160 (OWASP guides) | ||||
* | | Merge pull request #20201 from karanarora/Changelog-fix | Arun Agrawal | 2015-05-19 | 1 | -8/+8 |
|\ \ | | | | | | | Fix typos is CHANGELOG [ci skip] | ||||
| * | | Fix typos is CHANGELOG [ci skip] | karanarora | 2015-05-19 | 1 | -8/+8 |
|/ / | |||||
* | | Only define #positive? and #negative? on Ruby 2.2 | Rafael Mendonça França | 2015-05-19 | 2 | -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_numeric | Rafael Mendonça França | 2015-05-19 | 5 | -14/+14 |
|\ \ | | | | | | | | | | Move Integer#positive? and Integer#negative? query methods to Numeric | ||||
| * | | Move Integer#positive? and Integer#negative? query methods to Numeric class | Mehmet Emin İNAÇ | 2015-05-13 | 6 | -14/+18 |
| | | | | | | | | | | | | By this way Integer, Rational, Float, Fixnum, Bignum classes have the same behaviour | ||||
* | | | Merge pull request #20195 from tgxworld/fix_grammar | Rafael Mendonça França | 2015-05-19 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix grammar. [CI SKIP] | ||||
| * | | | Fix grammar. [CI SKIP] | Guo Xiang Tan | 2015-05-19 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #20175 from eugeneius/copy_schema_cache_after_fork | Rafael Mendonça França | 2015-05-18 | 3 | -24/+49 |
|\ \ \ | | | | | | | | | Add schema cache to new connection pool after fork | ||||
| * | | | Add schema cache to new connection pool after fork | Eugene Kenny | 2015-05-17 | 3 | -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 refute | Rafael Mendonça França | 2015-05-18 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #20191 from juggernaut-/patch-1 | Rafael Mendonça França | 2015-05-18 | 3 | -0/+20 |
|\ \ \ \ | | | | | | | | | | | | | | | | Added ActionDispatch::Journey::Routes#empty? | ||||
| * | | | | ActionDispatch::Journey::Routes#empty? test cases | Valentine Valyaeff | 2015-05-19 | 3 | -1/+17 |
| | | | | | |||||
| * | | | | Added ActionDispatch::Journey::Routes#empty? | juggernaut- | 2015-05-18 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge pull request #20187 from yui-knk/refactor/type_int | Rafael Mendonça França | 2015-05-18 | 1 | -3/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Refactoring `ActiveRecord::Type::Integer` limit | ||||
| * | | | | | Refactoring `ActiveRecord::Type::Integer` limit | yui-knk | 2015-05-18 | 1 | -3/+6 |
| | | | | | | |||||
* | | | | | | Merge pull request #20192 from kamipo/divide_to_column_options_handling_methods | Rafael Mendonça França | 2015-05-18 | 2 | -10/+34 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Divide methods for handling column options separately | ||||
| * | | | | | | Divide methods for handling column options separately | Ryuta Kamizono | 2015-05-18 | 2 | -10/+34 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #20190 from kamipo/fix_serial_with_quoted_sequence_name | Rafael Mendonça França | 2015-05-18 | 2 | -1/+10 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Fix `serial?` with quoted sequence name | ||||
| * | | | | | Fix `serial?` with quoted sequence name | Ryuta Kamizono | 2015-05-18 | 2 | -1/+10 |
| |/ / / / | |||||
* | | | | | Merge pull request #20082 from sh6khan/nested-attributes-docs | Eileen M. Uchitelle | 2015-05-18 | 1 | -0/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | docs for updating nested attributes while creating parent record | ||||
| * | | | | | docs for updating nested attributes while creating parent record [ci | sh6khan | 2015-05-18 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | skip] | ||||
* | | | | | | sqlite3_mem has an existing connection | Matthew Draper | 2015-05-18 | 1 | -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 Senn | 2015-05-18 | 2 | -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-doc1 | Yves Senn | 2015-05-18 | 1 | -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 docs | Roque Pinel | 2015-05-17 | 1 | -2/+2 |
|/ / / / / | | | | | | | | | | | | | | | | Based on #19976 and #18305. | ||||
* | | | | | Merge pull request #20178 from ↵ | Santiago Pastorino | 2015-05-17 | 1 | -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-17 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #20179 from gouravtiwari/patch-5 | Santiago Pastorino | 2015-05-17 | 1 | -5/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | formatting changes for mail options |