aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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`.
* 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
* | | Forgot to set Migration.verbose at f8d9a51949d6f6cfcab7cc7d501e137836eb88dc ↵Akira Matsuda2014-08-301-1/+1
| | | | | | | | | | | | :bomb:
* | | reduce object allocations in utc_offsetAaron Patterson2014-08-291-2/+2
| | | | | | | | | | | | | | | | | | `try` allocates an array on every call, we should avoid calling it in hotspots. This reduced AttributeMethodsTest#test_setting_time_zone_aware_attribute_with_string from 18k allocations to 14k
* | | We tenderized the wrong method! Object#try already had the yield option, ↵David Heinemeier Hansson2014-08-295-34/+20
| | | | | | | | | | | | just needed some tenderloving instance_eval to fit the bill
* | | Clarify the origin of this great addition to Rails :trollface: :trollface ↵David Heinemeier Hansson2014-08-291-1/+1
| | | | | | | | | | | | :trollface:
* | | Use instance_eval on @tenderlove's suggestion :trollface:David Heinemeier Hansson2014-08-293-7/+8
| | |
* | | Update examples to show real worthDavid Heinemeier Hansson2014-08-292-2/+11
| | |
* | | Added yield to Object#presenceDavid Heinemeier Hansson2014-08-293-1/+23
| | |
* | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-29181-1044/+1779
|\ \ \
| * \ \ Merge pull request #16746 from cristianbica/fix-backburner-adapterGodfrey Chan2014-08-291-1/+1
| |\ \ \ | | | | | | | | | | Fixed Active Job Backburner adapter
| | * | | Fixed Active Job Backburner adapterCristian Bica2014-08-301-1/+1
| |/ / /
| * | | Don't allow AR::Tasks::DatabaseTasks.migrate to mutate Migration.verbose valueAkira Matsuda2014-08-301-1/+3
| | | | | | | | | | | | | | | | This fixes random test failure in migrator_test.rb
| * | | Merge pull request #16741 from robin850/am-isolated-wo-bundleSantiago Pastorino2014-08-291-3/+2
| |\ \ \ | | | | | | | | | | Make test:isolated run without bundler for Action Mailer
| | * | | Make test:isolated run without bundler for Action MailerRobin Dupret2014-08-291-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Action Mailer tests weren't able to run in isolation without the bundle exec prefix since we were requiring gems before requiring abstract_unit. We don't need the `gem` call thus and the require_relative since the test directory should be present in the load path when we run any test.
| * | | | Merge pull request #16742 from robin850/rbx-aj-sidekiqSantiago Pastorino2014-08-291-8/+2
| |\ \ \ \ | | |/ / / | |/| | | Avoid skipping Sidekiq tests on Rubinius
| | * | | Avoid skipping Sidekiq tests on RubiniusRobin Dupret2014-08-291-8/+2
| |/ / / | | | | | | | | | | | | | | | | Now that Travis provides support for Rubinius 2.2.10, we can run the Sidekiq tests against this version.
| * | | Some documentation fixes [ci skip]Robin Dupret2014-08-293-10/+10
| | | |
| * | | Don't test PostgreSQL implementation detailsAkira Matsuda & Kohei Suzuki2014-08-291-3/+0
| | | | | | | | | | | | | | | | | | | | Asserting that the message contains "QUERY PLAN" is enough for the adapter's test. The plan may vary according to number of tuples etc. but that's out of our concern.
| * | | Merge pull request #16740 from seuros/activejobYves Senn2014-08-295-20/+25
| |\ \ \ | | | | | | | | | | [ActiveJob] extract JobBuffer from helper
| | * | | [ActiveJob] extract JobBuffer from helperAbdelkader Boudih2014-08-295-20/+25
| |/ / /
| * | | Revert "Merge pull request #16254 from ↵Yves Senn2014-08-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zuhao/refactor_activerecord_attribute_decorators_test" This reverts commit 16fe19831548f108c113094d106663497fc190d5, reversing changes made to 4c81c8ce533896be28bdc0b055ff30bb9dee1316. The call to `Model.reset_column_information` was to express the intent of the test. `reset_column_information` itself can trigger SQL queries because it checks for a tables existance. Let's move it outside of the block. /cc @sgrif
| * | | Merge pull request #16739 from y-yagi/patch-6Yves Senn2014-08-292-2/+2
| |\ \ \ | | | | | | | | | | [ci skip] Fix example code of ActiveRecord::FixtureSet.context_class
| | * | | [ci skip] Fix example code of ActiveRecord::FixtureSet.context_classyuuji.yaginuma2014-08-292-2/+2
| | | | |
| * | | | Merge pull request #16728 from splattael/invalid_address_errorYves Senn2014-08-292-1/+8
| |\ \ \ \ | | |/ / / | |/| | | Don't rescue IPAddr::InvalidAddressError
| | * | | Don't rescue IPAddr::InvalidAddressErrorPeter Suschlik2014-08-292-1/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | IPAddr::InvalidAddressError does not exist in Ruby 1.9.3 and fails for JRuby in 1.9 mode. As IPAddr::InvalidAddressError is a subclass of ArgumentError (via IPAddr::Error) just rescuing ArgumentError is fine.
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-28 17:38:47 +0000