aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #29230 from koic/remove_duplicate_schema_authorization_testMatthew Draper2017-05-261-11/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove a duplicate test of schema_authorization_test in ARKoichi ITO2017-05-251-11/+0
* | | | | | | | Merge pull request #29215 from voxmedia/ar_optimizationsMatthew Draper2017-05-263-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Make #deep_dup use #allocate instead of #newMichael Lovitt2017-05-251-1/+3
| * | | | | | | | Performance optimization for ActiveRecord#column_defaultsMichael Lovitt2017-05-241-1/+2
| * | | | | | | | Performance optimization for ActiveRecord#subclass_from_attributesMichael Lovitt2017-05-241-1/+1
| * | | | | | | | Performance optimization for AttributeSet#deep_dupMichael Lovitt2017-05-241-3/+1
* | | | | | | | | Merge pull request #29226 from koic/remove_duplicate_mysql_rake_testMatthew Draper2017-05-261-7/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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_schemaMatthew Draper2017-05-253-3/+56
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #29229 from andyatkinson/remove-redundant-test-methodMatthew Draper2017-05-261-7/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | Reorder first secrets edit flow.Kasper Timm Hansen2017-05-255-33/+61
| * | | | | | | | Remove needless waiting message.Kasper Timm Hansen2017-05-231-1/+0
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #29225 from maicher/masterRyuta Kamizono2017-05-251-0/+13
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | 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`Ryuta Kamizono2017-05-223-351/+184
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #29211 from yahonda/rubocop_namespacesMatthew Draper2017-05-251-21/+21
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | rubocop namespace changes from `Style` to `Layout`Yasuo Honda2017-05-241-21/+21
| | |_|_|/ / / | |/| | | | |
* | | | | | | 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 scopingRyuta Kamizono2017-05-242-3/+10
| | |_|/ / / / | |/| | | | |
* | | | | | | Capitalize GmailJon Moss2017-05-241-1/+1
* | | | | | | Merge pull request #29213 from nihemak/fix-docs-has-manyRyuta Kamizono2017-05-251-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | [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
|\ \ \ \ \ \
| * | | | | | 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]Mike Gunderloy2017-05-211-9/+11
* | | | | | | | 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]Mike Gunderloy2017-05-241-1/+2
|/ / / / / / / /
* | | | | | | | We dont actually use the ultra short-hand, so no need to complicate things wi...David Heinemeier Hansson2017-05-241-1/+1
* | | | | | | | 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 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 choicesSam Pohlenz2017-05-172-1/+18
* | | | | | | | Merge pull request #29141 from kamipo/make_helper_methods_to_privateMatthew Draper2017-05-241-18/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Make helper methods in tests to privateRyuta Kamizono2017-05-191-18/+19
* | | | | | | | | 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 specifiedRyuta Kamizono2017-05-192-1/+9
| |/ / / / / / / /
* | | | | | | | | Merge pull request #28644 from mtsmfm/set-capybara-app-hostMatthew Draper2017-05-242-1/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Set `Capybara.app_host` through `host!`Fumiaki MATSUSHIMA2017-04-022-1/+18
* | | | | | | | | | Merge pull request #29027 from mohitnatoo/foreign-key-nameMatthew Draper2017-05-241-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [Foreign Key] Don't worry about the building identifier if name is already pr...Mohit Natoo2017-05-101-2/+3
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | 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 ARKoichi ITO2017-05-211-14/+0