Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use correct operator in query based on JSON document | viditn91 | 2014-09-03 | 1 | -1/+2 |
| | |||||
* | Add a quick straw-man Incompatibilities section | Matthew Draper | 2014-09-03 | 1 | -0/+129 |
| | | | | | | | | | | Is this a thing we want? Note current duplication between the `assert_select` section here, and the corresponding release note entry... does this detail *move* from there to here? [ci skip] | ||||
* | Merge pull request #16762 from ↵ | Aaron Patterson | 2014-09-02 | 1 | -35/+52 |
|\ | | | | | | | | | eileencodes/refactor-add_constraints-complex-loop-conditional Refactor add_constraints complex loop conditional | ||||
| * | Break conditional branches into separate methods | eileencodes | 2014-09-01 | 1 | -35/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This breaks the two branches of the `if reflection.last` and `else` to clearer see where the two methods can be refactored. Eventually we hope to remove the need for these separated methods altogether. Move the first branch outside the loop This code doesn't need to be in the loop because it it always affects the last chain. `get_bind_values` and `add_constraints` must match in this context because `get_bind_values` is the caching of `add_constraints` Use each_cons to remove need for `chain[i + 1]` The `chain[i + 1]` is confusing because it's not immediately obvious what it's trying to achieve. The use of `each_cons` makes it clear we need to get the `next_reflection`. | ||||
* | | Merge pull request #16774 from cirosantilli/erb-erubis2 | Zachary Scott | 2014-09-02 | 1 | -3/+4 |
|\ \ | | | | | | | Shorten ActionView::Base doc summary line. [ci skip] | ||||
| * | | Shorten ActionView::Base doc summary line. [ci skip] | Ciro Santilli | 2014-09-02 | 1 | -3/+4 |
| | | | |||||
* | | | Merge pull request #16773 from cirosantilli/erb-erubis | Zachary Scott | 2014-09-02 | 1 | -1/+2 |
|\| | | | | | | | | Clarify Rails uses erubis not stdlin ERB. [ci skip] | ||||
| * | | Clarify Rails uses erubis not stdlin ERB. [ci skip] | Ciro Santilli | 2014-09-02 | 1 | -1/+2 |
|/ / | |||||
* | | Merge pull request #16772 from satoryu/master | Zachary Scott | 2014-09-02 | 1 | -1/+1 |
|\ \ | | | | | | | Remove '*' which doesn't belong [ci skip] | ||||
| * | | Remove '*' which doesn't work | Tatsuya Sato | 2014-09-03 | 1 | -1/+1 |
|/ / | | | | | I found an * does not work in Markdown notation. It should be removed. | ||||
* | | Merge pull request #16770 from arthurnn/add_string_strip_require | Rafael Mendonça França | 2014-09-02 | 3 | -1/+3 |
|\ \ | | | | | | | Add and Remove string/strip require | ||||
| * | | Add and Remove string/strip require | Arthur Neves | 2014-09-02 | 3 | -1/+3 |
|/ / | | | | | | | | | | | | | Method .strip_heredoc is defined in active_support/core_ext/string/strip.rb so we need to require it. [fixes #16677] | ||||
* | | Merge pull request #16724 from seuros/testcase | Rafael Mendonça França | 2014-09-02 | 10 | -16/+531 |
|\ \ | | | | | | | [ActiveJob] TestCase | ||||
| * | | [ActiveJob] TestCase (Will squash before merge) | Abdelkader Boudih | 2014-09-02 | 5 | -31/+31 |
| | | | |||||
| * | | [ActiveJob] TestCase | Abdelkader Boudih | 2014-09-02 | 8 | -365/+259 |
| | | | |||||
| * | | [ActiveJob] TestCase | Abdelkader Boudih | 2014-09-02 | 10 | -16/+637 |
| | | | |||||
* | | | Leave all our tests as order_dependent! for now | Matthew Draper | 2014-09-02 | 7 | -0/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We're seeing too many failures to believe otherwise. This reverts commits bc116a55ca3dd9f63a1f1ca7ade3623885adcc57, cbde413df3839e06dd14e3c220e9800af91e83ab, bf0a67931dd8e58f6f878b9510ae818ae1f29a3a, and 2440933fe2c27b27bcafcd9019717800db2641aa. | ||||
* | | | Merge pull request #16672 from cristianbica/queue-classic-later | Yves Senn | 2014-09-02 | 3 | -14/+46 |
|\ \ \ | | | | | | | | | ActiveJob: Implemented enqueue_at for QueueClassic | ||||
| * | | | ActiveJob: Implemented enqueue_at for QueueClassic | Cristian Bica | 2014-09-02 | 3 | -14/+46 |
|/ / / | |||||
* | | | Merge pull request #16767 from y-yagi/fix_message_delivery_doc | Yves Senn | 2014-09-02 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | [ci skip] Fix a typo in the doc of MessageDelivery | ||||
| * | | [ci skip] Fix a typo in the doc of MessageDelivery | yuuji.yaginuma | 2014-09-02 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #16450 from ↵ | Yves Senn | 2014-09-02 | 5 | -5/+48 |
|\ \ | | | | | | | | | | | | | | | | tgxworld/dont_swallow_error_when_identifying_constant_from_test_name Do not swallow exception on NameError within constant. | ||||
| * | | Use `safe_constantize`. | Guo Xiang Tan | 2014-09-02 | 4 | -5/+41 |
| | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/9933. | ||||
* | | | remove trailing whitespace. [ci skip] | Yves Senn | 2014-09-02 | 1 | -2/+2 |
| | | | |||||
* | | | MySQL: skip GTID-unsafe statement tests when enforce_gtid_consistency is enabled | Jeremy Kemper | 2014-09-01 | 3 | -23/+31 |
| | | | |||||
* | | | Move implementation to the gems | Rafael Mendonça França | 2014-09-01 | 2 | -22/+11 |
| | | | | | | | | | | | | Now we keep only the common code and move the specific code to the gems | ||||
* | | | Add test to assert the right sanitizer vendor is being used | Rafael Mendonça França | 2014-09-01 | 2 | -1/+42 |
| |/ |/| | |||||
* | | Remove warning | Rafael Mendonça França | 2014-09-01 | 1 | -2/+2 |
| | | |||||
* | | Try with web-console master | Rafael Mendonça França | 2014-09-01 | 1 | -1/+1 |
| | | |||||
* | | Use jquery-rails master | Rafael Mendonça França | 2014-09-01 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #16704 from ankit1910/use-existing-method | Rafael Mendonça França | 2014-09-01 | 1 | -1/+1 |
|\ | | | | | use self instead of #read_attribute | ||||
| * | use self instead of #read_attribute | ankit1910 | 2014-08-26 | 1 | -1/+1 |
| | | |||||
* | | Clear schema cache before each test | Akira Matsuda | 2014-09-01 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #16763 from brainopia/patch-1 | Godfrey Chan | 2014-09-01 | 1 | -1/+1 |
|\ \ | | | | | | | Fix for configuring rails guide [ci skip] | ||||
| * | | Fix for configuring rails guide | Ravil Bayramgalin | 2014-09-01 | 1 | -1/+1 |
|/ / | | | | | | | `ActiveSupport::Logger` has no concept like auto flushing since it has no userspace buffering. It's a remnant of `ActiveSupport::BufferedLogger` epoch which was since removed from rails. | ||||
* | | Clear schema cache before each test | Akira Matsuda | 2014-09-01 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #16755 from codeodor/master | Aaron Patterson | 2014-08-31 | 2 | -3/+36 |
|\ \ | | | | | | | Allow polymorphic routes with nil when a route can still be drawn | ||||
| * | | Allow polymorphic routes with nil when a route can still be drawn | Sammy Larbi | 2014-08-31 | 2 | -3/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppose you have two resources routed in the following manner: ```ruby resources :blogs do resources :posts end resources :posts ``` When using polymorphic resource routing like `url_for([@blog, @post])`, and `@blog` is `nil` Rails should still try to match the route to the top-level posts resource. Fixes #16754 | ||||
* | | | Keep it closer to the original wording [ci skip] | Godfrey Chan | 2014-08-31 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #16747 from rsutphin/web-console-gemfile-comment | Guillermo Iguaran | 2014-08-31 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Clarify that /console is an optional feature | ||||
| * | | Since /console is an optional feature, mention <%= console %> instead. | Rhett Sutphin | 2014-08-31 | 1 | -1/+1 |
|/ / | | | | | | | (/console is not mounted by default with web-console 2.0.) | ||||
* | | Clean up grammar from #16752 [ci skip] | Zachary Scott | 2014-08-30 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #16751 from seuros/rename | Jeremy Kemper | 2014-08-30 | 1 | -0/+0 |
|\ \ | | | | | | | [ActionMailer] Rename test/test_test to test/test_case_test | ||||
| * | | [ActionMailer] Rename test/test_test to test/test_case_test | Abdelkader Boudih | 2014-08-30 | 1 | -0/+0 |
| | | | |||||
* | | | Merge pull request #16752 from Shruti2791/shruti_workspace | Zachary Scott | 2014-08-30 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | [ci skip] add line about text layout | ||||
| * | | | [ci skip] add line about text layout | shruti2791 | 2014-08-30 | 1 | -1/+2 |
| |/ / | |||||
* | | | MySQL: set connection collation along with the charset | Jeremy Kemper | 2014-08-30 | 5 | -1/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets the connection collation to the database collation configured in database.yml. Otherwise, `SET NAMES utf8mb4` will use the default collation for that charset (utf8mb4_general_ci) when you may have chosen a different collation, like utf8mb4_unicode_ci. This only applies to literal string comparisons, not column values, so it is unlikely to affect you. | ||||
* | | | AR#reset_column_information sometimes queries via table_exists? | Akira Matsuda | 2014-08-31 | 1 | -1/+1 |
|/ / | | | | | | | so this assertion causes random test fail | ||||
* | | Refer to the library name instead of the constant | Robin Dupret | 2014-08-30 | 7 | -7/+7 |
| | | | | | | | | | | | | | | | | | | When we are loading a component and we want to know its version, we are actually not speaking about the constant but the library itself. [ci skip] [Godfrey Chan & Xavier Noria] | ||||
* | | Merge pull request #16644 from Agis-/drb-tests-actionpack-vagrant | Xavier Noria | 2014-08-30 | 1 | -3/+1 |
|\ \ | | | | | | | Use system /tmp for temp files when testing actionpack |