aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #29226 from koic/remove_duplicate_mysql_rake_testMatthew Draper2017-05-261-7/+0
|\ | | | | Remove a duplicate test of mysql_rake_test
| * Remove a duplicate test of mysql_rake_testKoichi ITO2017-05-261-7/+0
| |
* | Merge pull request #29216 from matthewd/threadsafe-load-schemaMatthew Draper2017-05-263-3/+56
|\ \ | | | | | | Add a Monitor to ModelSchema#load_schema
| * | Add a Monitor to ModelSchema#load_schemaMatthew Draper2017-05-253-3/+56
| | | | | | | | | | | | [Vikrant Chaudhary, David Abdemoulaie, Matthew Draper]
* | | Merge pull request #29229 from andyatkinson/remove-redundant-test-methodMatthew Draper2017-05-261-7/+1
|\ \ \ | | | | | | | | Remove redundant test method
| * | | Remove redundant test methodAndy Atkinson2017-05-251-7/+1
|/ / /
* | | Merge pull request #29195 from kaspth/rails-secrets-better-edit-exceptionKasper Timm Hansen2017-05-255-34/+61
|\ \ \ | | | | | | | | Make `secrets:edit` run `secrets:setup` if it hasn't already.
| * | | Reorder first secrets edit flow.Kasper Timm Hansen2017-05-255-33/+61
| | | | | | | | | | | | | | | | | | | | | | | | Setup config/secrets.yml.enc with template contents for people to edit. Then generate encryption key and encrypt the initial secrets.
| * | | Remove needless waiting message.Kasper Timm Hansen2017-05-231-1/+0
| | | | | | | | | | | | | | | | | | | | Needed back when we attempted to wait for editors, but now we expect users to pass a -w flag to their $EDITOR.
* | | | Merge pull request #29225 from maicher/masterRyuta Kamizono2017-05-251-0/+13
|\ \ \ \ | |_|_|/ |/| | | Add ActiveRecord::Relation#or description to guides
| * | | Add ActiveRecord::Relation#or description to guides [ci skip]Krzysztof Maicher2017-05-251-0/+13
| | | |
* | | | Merge pull request #29175 from kamipo/extract_json_shared_testsMatthew Draper2017-05-253-351/+184
|\ \ \ \ | | | | | | | | | | Extract `JSONSharedTestCases`
| * | | | Extract `JSONSharedTestCases`Ryuta Kamizono2017-05-223-351/+184
| | | | | | | | | | | | | | | | | | | | | | | | | Both `mysql2/json_test.rb` and `postgresql/json_test.rb` have same test cases.
* | | | | Merge pull request #29211 from yahonda/rubocop_namespacesMatthew Draper2017-05-251-21/+21
|\ \ \ \ \ | | | | | | | | | | | | rubocop namespace changes from `Style` to `Layout`
| * | | | | rubocop namespace changes from `Style` to `Layout`Yasuo Honda2017-05-241-21/+21
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refer https://github.com/bbatsov/rubocop/pull/4278/commits/54166bf76ba76b14f1bbc8a34165f175dbc3f227 for the commit ``` /path/to/rails/.rubocop.yml: Style/CaseIndentation has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/CommentIndentation has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/EmptyLines has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/EmptyLinesAroundClassBody has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/EmptyLinesAroundMethodBody has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/EmptyLinesAroundModuleBody has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/IndentationConsistency has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/IndentationWidth has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceAfterColon has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceAfterComma has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceAroundEqualsInParameterDefault has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceAroundKeyword has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceAroundOperators has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceBeforeFirstArg has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceBeforeBlockBraces has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceInsideBlockBraces has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceInsideHashLiteralBraces has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/SpaceInsideParens has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/Tab has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/TrailingBlankLines has the wrong namespace - should be Layout /path/to/rails/.rubocop.yml: Style/TrailingWhitespace has the wrong namespace - should be Layout ```
* | | | | Merge pull request #29181 from kamipo/fix_circular_left_joins_with_scopingMatthew Draper2017-05-252-3/+10
|\ \ \ \ \ | | | | | | | | | | | | Fix crashing on circular left join references with scoping
| * | | | | Fix crashing on circular left join references with scopingRyuta Kamizono2017-05-242-3/+10
| | |_|/ / | |/| | | | | | | | | | | | | Follow up of #25702.
* | | | | Capitalize GmailJon Moss2017-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `gmail` --> `Gmail` [ci skip]
* | | | | Merge pull request #29213 from nihemak/fix-docs-has-manyRyuta Kamizono2017-05-251-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | [ci skip]fix wrong variable name in docs
| * | | | [ci skip]fix wrong variable name in docsMakoto Nihei2017-05-251-1/+1
|/ / / /
* | | | Merge pull request #29203 from koic/bump_rubocop_and_fix_rubocop_offencesRafael França2017-05-245-9/+9
|\ \ \ \ | | | | | | | | | | Bump RuboCop to 0.49.0 and fix offences
| * | | | Fix a RuboCop offences using `rubocop -a`Koichi ITO2017-05-244-7/+4
| | | | |
| * | | | Bump rubocop and dependent gem versionsKoichi ITO2017-05-241-2/+5
| | | | |
* | | | | Merge pull request #29169 from ffmike/api-guide-editRafael França2017-05-241-9/+11
|\ \ \ \ \ | | | | | | | | | | | | Update Rails API Application guide to match current code [ci skip]
| * | | | | Update Rails API Application guide to match current code [ci skip]Mike Gunderloy2017-05-211-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adjust list of middlewares loaded by default * Add routing middleware to list to match the list in the Rack guide * Adjust list of Controller modules loaded by default Plus fix one singular/plural mistake
* | | | | | Merge pull request #29209 from ffmike/action-mailer-gmail-noteRafael França2017-05-241-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update information on using Gmail when 2FA is in use [ci skip]
| * | | | | | Update information on using Gmail when 2FA is in use [ci skip]Mike Gunderloy2017-05-241-1/+2
|/ / / / / /
* | | | | | We dont actually use the ultra short-hand, so no need to complicate things ↵David Heinemeier Hansson2017-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | with it
* | | | | | Slim down the source definitionDavid Heinemeier Hansson2017-05-241-5/+1
| |_|/ / / |/| | | |
* | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 23:43:34 +0000