aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge pull request #25037 from mohitnatoo/adapter-inquirerRafael França2017-05-262-3/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Removed string inquiry.Mohit Natoo2017-05-262-6/+6
| * | | | | | | | | | | | Provides friendlier way to access queue adapters of a job.Mohit Natoo2017-05-262-4/+22
* | | | | | | | | | | | | Merge pull request #29238 from ashishg-qburst/generatorRafael França2017-05-262-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Do not show --webpack option in the plugin help messageash2017-05-262-4/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #29239 from koic/remove_redundant_test_assertionMatthew Draper2017-05-271-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove a redundant test assertionKoichi ITO2017-05-271-1/+0
* | | | | | | | | | | | | ActiveSupport::CurrentAttributes provides a thread-isolated attributes single...David Heinemeier Hansson2017-05-266-0/+385
* | | | | | | | | | | | | Merge pull request #29232 from koic/ci_against_jruby_9_1_10_0Matthew Draper2017-05-271-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | CI against JRuby 9.1.10.0Koichi ITO2017-05-261-3/+3
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #29234 from y-yagi/remove_unused_test_classGuillermo Iguaran2017-05-261-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove unused test classyuuji.yaginuma2017-05-261-3/+0
* | | | | | | | | | | | | Avoid circular require due to autoloadMatthew Draper2017-05-261-9/+9
* | | | | | | | | | | | | Prevent a redefinition warning when the real Rails.root appearsMatthew Draper2017-05-261-2/+3
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #29176 from bogdanvlviv/define-path-with__dir__Matthew Draper2017-05-26117-204/+197
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Define path with __dir__bogdanvlviv2017-05-23117-204/+197
* | | | | | | | | | | | | Merge pull request #29221 from koic/remove_duplicate_migration_testMatthew Draper2017-05-261-27/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove a duplicate test of migration_test in ARKoichi ITO2017-05-251-27/+0
* | | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |