aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* `DEFAULT_ENV` falls back to `default_env` when `RAILS_ENV` or `RACK_ENV` is ↵Ryuta Kamizono2017-05-253-2/+13
| | | | | | an empty string Follow up of #27399.
* Merge pull request #29201 from willnet/fix-docs-has-oneRyuta Kamizono2017-05-241-2/+2
|\ | | | | [ci skip]fix wrong method name in docs
| * [ci skip]fix wrong method name in docswillnet2017-05-241-2/+2
| |
* | Merge pull request #29119 from spohlenz/fix-select-with-enumerableMatthew Draper2017-05-242-1/+18
|\ \ | | | | | | Fix select tag helper used with Enumerable choices
| * | Fix select tag helper used with Enumerable choicesSam Pohlenz2017-05-172-1/+18
| | | | | | | | | | | | | | | | | | Allows a custom object implementing Enumerable to be used as the choices parameter for a select tag, which previously wasn't possible due to the call to `empty?` on the choices (which isn't implemented on Enumerable).
* | | Merge pull request #29141 from kamipo/make_helper_methods_to_privateMatthew Draper2017-05-241-18/+19
|\ \ \ | | | | | | | | Make helper methods in tests to private
| * | | Make helper methods in tests to privateRyuta Kamizono2017-05-191-18/+19
| | | | | | | | | | | | | | | | | | | | `make_model` and `make_no_pk_hm_t` in `HasManyThroughAssociationsTest` are not a test case. it should be private.
* | | | Merge pull request #29145 from kamipo/reference_type_should_be_not_nullMatthew Draper2017-05-242-1/+9
|\ \ \ \ | | | | | | | | | | Both reference id and type should be `NOT NULL` if `null: false` is specified
| * | | | Both reference id and type should be `NOT NULL` if `null: false` is specifiedRyuta Kamizono2017-05-192-1/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | This is a regression due to #28282. Fixes #29136.
* | | | Merge pull request #28644 from mtsmfm/set-capybara-app-hostMatthew Draper2017-05-242-1/+18
|\ \ \ \ | | | | | | | | | | Set `Capybara.app_host` through `host!`
| * | | | Set `Capybara.app_host` through `host!`Fumiaki MATSUSHIMA2017-04-022-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `visit "/"` will visit always "http://127.0.0.1" even when we call `host!`: ```ruby class SomeTest < ApplicationSystemTest def setup host! "http://example.com" end def test_visit visit root_url # => visit "http://example.com/" visit "/" # => visit "http://127.0.0.1/" end end ``` Because Capybara assumes that host is same as the server if we don't set `Capybara.app_host`: https://github.com/teamcapybara/capybara/blob/866c975076f92b5d064ee8998be638dd213f0724/lib/capybara/session.rb#L239
* | | | | Merge pull request #29027 from mohitnatoo/foreign-key-nameMatthew Draper2017-05-241-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Adding Foreing Key - Don't worry about building the identifier if name is already present.
| * | | | | [Foreign Key] Don't worry about the building identifier if name is already ↵Mohit Natoo2017-05-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | present.
* | | | | | Merge pull request #29167 from koic/remove_duplicate_inverse_associations_testMatthew Draper2017-05-241-14/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Remove a duplicate test of inverse_associations_test in AR
| * | | | | Remove a duplicate test of inverse_associations_test in ARKoichi ITO2017-05-211-14/+0
| | | | | |
* | | | | | Merge pull request #29174 from kamipo/remove_unused_join_part_nameMatthew Draper2017-05-241-4/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused `JoinPart#name`
| * | | | | | Remove unused `JoinPart#name`Ryuta Kamizono2017-05-221-4/+0
| | | | | | |
* | | | | | | Merge pull request #29179 from y-yagi/remove_rubygems_version_lockMatthew Draper2017-05-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove rubygems version lock
| * | | | | | | Remove rubygems version lockyuuji.yaginuma2017-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version lock added by 3d890b66c1bfbdcabb7ef66e0774e0f01e2ed5d6. But original issue is fixed with bundler 1.15. Ref: https://github.com/rubygems/rubygems/issues/1911#issuecomment-300148516
* | | | | | | | Merge pull request #29182 from kamipo/remove_unused_left_joins_values_generationMatthew Draper2017-05-242-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove unused `left_joins_values` generation
| * | | | | | | | Remove unused `left_joins_values` generationRyuta Kamizono2017-05-232-2/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | This was added at #22125 but `left_joins_values` is never used.
* | | | | | | | Merge pull request #29183 from kamipo/refactor_making_join_constraintsMatthew Draper2017-05-241-23/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Refactor making join constraints
| * | | | | | | | Refactor making join constraintsRyuta Kamizono2017-05-231-23/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only difference between `make_inner_joins` and `make_left_outer_joins` is the `join_type`.
* | | | | | | | | Merge pull request #29184 from kirs/nested-attributes-friendly-errorMatthew Draper2017-05-242-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | More friendly exception in nested attributes
| * | | | | | | | | More friendly exception in nested attributesKir Shatrov2017-05-222-2/+2
| |/ / / / / / / /
* / / / / / / / / Remove unused simulate methodeileencodes2017-05-222-21/+21
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method was only used in the Rails tests and not by other methods in the Rails simulator. Because it's a no-doc'd class it should be safe to remove without deprecation.
* | | | | | | | Merge pull request #29178 from simi/patch-1प्रथमेश Sonpatki2017-05-221-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Update test link in ActionView javascripts README.md.
| * | | | | | | Update test link in ActionView javascripts README.md.Josef Šimánek2017-05-221-1/+1
|/ / / / / / / | | | | | | | | | | | | | | [ci skip]
* / / / / / / We always + 1 to __LINE__ when class_evaling with <<Akira Matsuda2017-05-221-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #29173 from ffmike/simplify-getting-startedRobin Dupret2017-05-211-12/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Simplify handling of prerequisites in Getting Started guide [ci skip]
| * | | | | | Simplify handling of prerequisites in Getting Started guide [ci skip]Mike Gunderloy2017-05-211-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Telling people about prerequisites, and then telling them a page later how to check and install those prerequisites, is confusing. This commit removes the list and just handles the software installation in one place. Fixes #28565
* | | | | | | Merge pull request #29072 from ↵Robin Dupret2017-05-215-1/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dixpac/dixpac/add_documentation_for_validate_and_callback_order_of_execution Improving docs for callbacks execution order [ci skip]
| * | | | | | | Improving docs for callbacks execution order [ci skip]dixpac2017-05-215-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When define callbacks latest definition on the same callback/method overwrites previous ones.
* | | | | | | | Merge pull request #29163 from rails/fix-scalar-duration-calculationAndrew White2017-05-213-6/+91
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix implicit calculations with scalars and durations
| * | | | | | | | Fix implicit calculations with scalars and durationsAndrew White2017-05-203-6/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously calculations where the scalar is first would be converted to a duration of seconds but this causes issues with dates being converted to times, e.g: Time.zone = "Beijing" # => Asia/Shanghai date = Date.civil(2017, 5, 20) # => Mon, 20 May 2017 2 * 1.day # => 172800 seconds date + 2 * 1.day # => Mon, 22 May 2017 00:00:00 CST +08:00 Now the `ActiveSupport::Duration::Scalar` calculation methods will try to maintain the part structure of the duration where possible, e.g: Time.zone = "Beijing" # => Asia/Shanghai date = Date.civil(2017, 5, 20) # => Mon, 20 May 2017 2 * 1.day # => 2 days date + 2 * 1.day # => Mon, 22 May 2017 Fixes #29160, #28970.
* | | | | | | | | Merge pull request #29170 from ffmike/remove-obsolete-guidesKasper Timm Hansen2017-05-212-246/+0
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Remove obsolete Guides source files [ci skip]
| * | | | | | | | Remove obsolete Guides source files [ci skip]Mike Gunderloy2017-05-212-246/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Nested Model Forms guide is out of date, not linked from index, and material is covered in the Form Helpers guide. * Profiling guide was committed as an outline years ago and never actually written.
* | | | | | | | | Merge pull request #29168 from ffmike/fix-broken-links-guidesप्रथमेश Sonpatki2017-05-211-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix broken external link in security guide.
| * | | | | | | | Fix broken external link in security guide.Mike Gunderloy2017-05-211-1/+1
|/ / / / / / / /
* | | | | | | | bundle up sidekiq to the one with safer integration with Rails 5Akira Matsuda2017-05-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see: https://github.com/mperham/sidekiq/blob/master/5.0-Upgrade.md
* | | | | | | | Merge pull request #29166 from kevinhyunilkim/fix_typo_in_guideRyuta Kamizono2017-05-211-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Fix typo in guides [ci skip]
| * | | | | | | Fix typo in guidesKevin Kim2017-05-211-1/+1
|/ / / / / / /
* | | | | | | identifiers is already defined via Connection::Identification moduleAkira Matsuda2017-05-211-1/+1
| | | | | | |
* | | | | | | bundle up redis to the one that does not warn about ::Fixnum deprecationAkira Matsuda2017-05-211-2/+2
| | | | | | |
* | | | | | | Merge pull request #29156 from kamipo/make_valid_directions_to_setAndrew White2017-05-201-3/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make `VALID_DIRECTIONS` to `Set`
| * | | | | | | Make `VALID_DIRECTIONS` to `Set`Ryuta Kamizono2017-05-201-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```ruby require "benchmark/ips" require "set" array = [:asc, :desc, :ASC, :DESC, "asc", "desc", "ASC", "DESC"] set = array.to_set item = "DESC" Benchmark.ips do |x| x.report "array" do array.include?(item) end x.report "set" do set.include?(item) end end ``` ``` % ruby array_vs_set.rb Warming up -------------------------------------- array 188.441k i/100ms set 229.531k i/100ms Calculating ------------------------------------- array 3.508M (± 9.0%) i/s - 17.525M in 5.043058s set 5.134M (± 7.6%) i/s - 25.707M in 5.038921s ```
* | | | | | | | Merge pull request #29162 from ffmike/update-rack-guideVijay Dev2017-05-201-6/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update 'Rails on Rack' guide [ci skip]
| * | | | | | | | Update 'Rails on Rack' guide [ci skip]Mike Gunderloy2017-05-201-6/+11
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adjust middlewares list to match current defaults * application.routes runs on application object, not Rails * Add explanation of Sprockets::Rails::QuietAssets
* | / / / / / / Remove unused mismatch payload attributeDavid Heinemeier Hansson2017-05-201-5/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #29158 from ffmike/add-json-feedAndrew White2017-05-205-7/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add :json type to auto_discovery_link_tag
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 04:52:13 +0000