aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16762 from ↵Aaron Patterson2014-09-021-35/+52
|\ | | | | | | | | eileencodes/refactor-add_constraints-complex-loop-conditional Refactor add_constraints complex loop conditional
| * Break conditional branches into separate methodseileencodes2014-09-011-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-erubis2Zachary Scott2014-09-021-3/+4
|\ \ | | | | | | Shorten ActionView::Base doc summary line. [ci skip]
| * | Shorten ActionView::Base doc summary line. [ci skip]Ciro Santilli2014-09-021-3/+4
| | |
* | | Merge pull request #16773 from cirosantilli/erb-erubisZachary Scott2014-09-021-1/+2
|\| | | | | | | | Clarify Rails uses erubis not stdlin ERB. [ci skip]
| * | Clarify Rails uses erubis not stdlin ERB. [ci skip]Ciro Santilli2014-09-021-1/+2
|/ /
* | Merge pull request #16772 from satoryu/masterZachary Scott2014-09-021-1/+1
|\ \ | | | | | | Remove '*' which doesn't belong [ci skip]
| * | Remove '*' which doesn't workTatsuya Sato2014-09-031-1/+1
|/ / | | | | I found an * does not work in Markdown notation. It should be removed.
* | Merge pull request #16770 from arthurnn/add_string_strip_requireRafael Mendonça França2014-09-023-1/+3
|\ \ | | | | | | Add and Remove string/strip require
| * | Add and Remove string/strip requireArthur Neves2014-09-023-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/testcaseRafael Mendonça França2014-09-0210-16/+531
|\ \ | | | | | | [ActiveJob] TestCase
| * | [ActiveJob] TestCase (Will squash before merge)Abdelkader Boudih2014-09-025-31/+31
| | |
| * | [ActiveJob] TestCaseAbdelkader Boudih2014-09-028-365/+259
| | |
| * | [ActiveJob] TestCaseAbdelkader Boudih2014-09-0210-16/+637
| | |
* | | Leave all our tests as order_dependent! for nowMatthew Draper2014-09-027-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-laterYves Senn2014-09-023-14/+46
|\ \ \ | | | | | | | | ActiveJob: Implemented enqueue_at for QueueClassic
| * | | ActiveJob: Implemented enqueue_at for QueueClassicCristian Bica2014-09-023-14/+46
|/ / /
* | | Merge pull request #16767 from y-yagi/fix_message_delivery_docYves Senn2014-09-021-3/+3
|\ \ \ | |/ / |/| | [ci skip] Fix a typo in the doc of MessageDelivery
| * | [ci skip] Fix a typo in the doc of MessageDeliveryyuuji.yaginuma2014-09-021-3/+3
|/ /
* | Merge pull request #16450 from ↵Yves Senn2014-09-025-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 Tan2014-09-024-5/+41
| | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/9933.
* | | remove trailing whitespace. [ci skip]Yves Senn2014-09-021-2/+2
| | |
* | | MySQL: skip GTID-unsafe statement tests when enforce_gtid_consistency is enabledJeremy Kemper2014-09-013-23/+31
| | |
* | | Move implementation to the gemsRafael Mendonça França2014-09-012-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 usedRafael Mendonça França2014-09-012-1/+42
| |/ |/|
* | Remove warningRafael Mendonça França2014-09-011-2/+2
| |
* | Try with web-console masterRafael Mendonça França2014-09-011-1/+1
| |
* | Use jquery-rails masterRafael Mendonça França2014-09-012-2/+2
|/
* Merge pull request #16704 from ankit1910/use-existing-methodRafael Mendonça França2014-09-011-1/+1
|\ | | | | use self instead of #read_attribute
| * use self instead of #read_attributeankit19102014-08-261-1/+1
| |
* | Clear schema cache before each testAkira Matsuda2014-09-011-0/+1
| |
* | Merge pull request #16763 from brainopia/patch-1Godfrey Chan2014-09-011-1/+1
|\ \ | | | | | | Fix for configuring rails guide [ci skip]
| * | Fix for configuring rails guideRavil Bayramgalin2014-09-011-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 testAkira Matsuda2014-09-011-0/+1
| |
* | Merge pull request #16755 from codeodor/masterAaron Patterson2014-08-312-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 drawnSammy Larbi2014-08-312-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 Chan2014-08-311-1/+1
| | |
* | | Merge pull request #16747 from rsutphin/web-console-gemfile-commentGuillermo Iguaran2014-08-311-1/+1
|\ \ \ | |/ / |/| | Clarify that /console is an optional feature
| * | Since /console is an optional feature, mention <%= console %> instead.Rhett Sutphin2014-08-311-1/+1
|/ / | | | | | | (/console is not mounted by default with web-console 2.0.)
* | Clean up grammar from #16752 [ci skip]Zachary Scott2014-08-301-2/+2
| |
* | Merge pull request #16751 from seuros/renameJeremy Kemper2014-08-301-0/+0
|\ \ | | | | | | [ActionMailer] Rename test/test_test to test/test_case_test
| * | [ActionMailer] Rename test/test_test to test/test_case_testAbdelkader Boudih2014-08-301-0/+0
| | |
* | | Merge pull request #16752 from Shruti2791/shruti_workspaceZachary Scott2014-08-301-1/+2
|\ \ \ | | | | | | | | [ci skip] add line about text layout
| * | | [ci skip] add line about text layoutshruti27912014-08-301-1/+2
| |/ /
* | | MySQL: set connection collation along with the charsetJeremy Kemper2014-08-305-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 Matsuda2014-08-311-1/+1
|/ / | | | | | | so this assertion causes random test fail
* | Refer to the library name instead of the constantRobin Dupret2014-08-307-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-vagrantXavier Noria2014-08-301-3/+1
|\ \ | | | | | | Use system /tmp for temp files when testing actionpack
| * | Use system /tmp when testing actionpackAgis-2014-08-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/c64bff2c87ebf363703c63ecd4a96d56a1a78364 added support and enabled parallel execution of the actionpack tests. However it introduced https://github.com/rails/rails/commit/c64bff2c87ebf363703c63ecd4a96d56a1a78364 since one cannot connect to a socket file that's inside a Vagrant synced folder due to security restrictions, and DRb tries to. Also rename the temporary files to make it obvious that they're rails-related, since now they're placed outside the project's directory. Fixes https://github.com/rails/rails/commit/c64bff2c87ebf363703c63ecd4a96d56a1a78364
* | | Bring back the test cases for `presence`Godfrey Chan2014-08-291-0/+5
| | | | | | | | | | | | This was removed by mistake in 5e51bdd
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 13:54:16 +0000