Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #29216 from matthewd/threadsafe-load-schema | Matthew Draper | 2017-05-26 | 3 | -3/+56 |
|\ | |||||
| * | Add a Monitor to ModelSchema#load_schema | Matthew Draper | 2017-05-25 | 3 | -3/+56 |
* | | Merge pull request #29229 from andyatkinson/remove-redundant-test-method | Matthew Draper | 2017-05-26 | 1 | -7/+1 |
|\ \ | |||||
| * | | Remove redundant test method | Andy Atkinson | 2017-05-25 | 1 | -7/+1 |
|/ / | |||||
* | | Merge pull request #29195 from kaspth/rails-secrets-better-edit-exception | Kasper Timm Hansen | 2017-05-25 | 5 | -34/+61 |
|\ \ | |||||
| * | | Reorder first secrets edit flow. | Kasper Timm Hansen | 2017-05-25 | 5 | -33/+61 |
| * | | Remove needless waiting message. | Kasper Timm Hansen | 2017-05-23 | 1 | -1/+0 |
* | | | Merge pull request #29225 from maicher/master | Ryuta Kamizono | 2017-05-25 | 1 | -0/+13 |
|\ \ \ | |||||
| * | | | Add ActiveRecord::Relation#or description to guides [ci skip] | Krzysztof Maicher | 2017-05-25 | 1 | -0/+13 |
* | | | | Merge pull request #29175 from kamipo/extract_json_shared_tests | Matthew Draper | 2017-05-25 | 3 | -351/+184 |
|\ \ \ \ | |||||
| * | | | | Extract `JSONSharedTestCases` | Ryuta Kamizono | 2017-05-22 | 3 | -351/+184 |
* | | | | | Merge pull request #29211 from yahonda/rubocop_namespaces | Matthew Draper | 2017-05-25 | 1 | -21/+21 |
|\ \ \ \ \ | |||||
| * | | | | | rubocop namespace changes from `Style` to `Layout` | Yasuo Honda | 2017-05-24 | 1 | -21/+21 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #29181 from kamipo/fix_circular_left_joins_with_scoping | Matthew Draper | 2017-05-25 | 2 | -3/+10 |
|\ \ \ \ \ | |||||
| * | | | | | Fix crashing on circular left join references with scoping | Ryuta Kamizono | 2017-05-24 | 2 | -3/+10 |
| | |_|/ / | |/| | | | |||||
* | | | | | Capitalize Gmail | Jon Moss | 2017-05-24 | 1 | -1/+1 |
* | | | | | Merge pull request #29213 from nihemak/fix-docs-has-many | Ryuta Kamizono | 2017-05-25 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | [ci skip]fix wrong variable name in docs | Makoto Nihei | 2017-05-25 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #29203 from koic/bump_rubocop_and_fix_rubocop_offences | Rafael França | 2017-05-24 | 5 | -9/+9 |
|\ \ \ \ | |||||
| * | | | | Fix a RuboCop offences using `rubocop -a` | Koichi ITO | 2017-05-24 | 4 | -7/+4 |
| * | | | | Bump rubocop and dependent gem versions | Koichi ITO | 2017-05-24 | 1 | -2/+5 |
* | | | | | Merge pull request #29169 from ffmike/api-guide-edit | Rafael França | 2017-05-24 | 1 | -9/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Update Rails API Application guide to match current code [ci skip] | Mike Gunderloy | 2017-05-21 | 1 | -9/+11 |
* | | | | | | Merge pull request #29209 from ffmike/action-mailer-gmail-note | Rafael França | 2017-05-24 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update information on using Gmail when 2FA is in use [ci skip] | Mike Gunderloy | 2017-05-24 | 1 | -1/+2 |
|/ / / / / / | |||||
* | | | | | | We dont actually use the ultra short-hand, so no need to complicate things wi... | David Heinemeier Hansson | 2017-05-24 | 1 | -1/+1 |
* | | | | | | Slim down the source definition | David Heinemeier Hansson | 2017-05-24 | 1 | -5/+1 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #29201 from willnet/fix-docs-has-one | Ryuta Kamizono | 2017-05-24 | 1 | -2/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | [ci skip]fix wrong method name in docs | willnet | 2017-05-24 | 1 | -2/+2 |
* | | | | | Merge pull request #29119 from spohlenz/fix-select-with-enumerable | Matthew Draper | 2017-05-24 | 2 | -1/+18 |
|\ \ \ \ \ | |||||
| * | | | | | Fix select tag helper used with Enumerable choices | Sam Pohlenz | 2017-05-17 | 2 | -1/+18 |
* | | | | | | Merge pull request #29141 from kamipo/make_helper_methods_to_private | Matthew Draper | 2017-05-24 | 1 | -18/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make helper methods in tests to private | Ryuta Kamizono | 2017-05-19 | 1 | -18/+19 |
* | | | | | | | Merge pull request #29145 from kamipo/reference_type_should_be_not_null | Matthew Draper | 2017-05-24 | 2 | -1/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Both reference id and type should be `NOT NULL` if `null: false` is specified | Ryuta Kamizono | 2017-05-19 | 2 | -1/+9 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #28644 from mtsmfm/set-capybara-app-host | Matthew Draper | 2017-05-24 | 2 | -1/+18 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Set `Capybara.app_host` through `host!` | Fumiaki MATSUSHIMA | 2017-04-02 | 2 | -1/+18 |
* | | | | | | | | Merge pull request #29027 from mohitnatoo/foreign-key-name | Matthew Draper | 2017-05-24 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | [Foreign Key] Don't worry about the building identifier if name is already pr... | Mohit Natoo | 2017-05-10 | 1 | -2/+3 |
* | | | | | | | | | Merge pull request #29167 from koic/remove_duplicate_inverse_associations_test | Matthew Draper | 2017-05-24 | 1 | -14/+0 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Remove a duplicate test of inverse_associations_test in AR | Koichi ITO | 2017-05-21 | 1 | -14/+0 |
* | | | | | | | | | Merge pull request #29174 from kamipo/remove_unused_join_part_name | Matthew Draper | 2017-05-24 | 1 | -4/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove unused `JoinPart#name` | Ryuta Kamizono | 2017-05-22 | 1 | -4/+0 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #29179 from y-yagi/remove_rubygems_version_lock | Matthew Draper | 2017-05-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove rubygems version lock | yuuji.yaginuma | 2017-05-22 | 1 | -1/+1 |
* | | | | | | | | | | Merge pull request #29182 from kamipo/remove_unused_left_joins_values_generation | Matthew Draper | 2017-05-24 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Remove unused `left_joins_values` generation | Ryuta Kamizono | 2017-05-23 | 2 | -2/+2 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #29183 from kamipo/refactor_making_join_constraints | Matthew Draper | 2017-05-24 | 1 | -23/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Refactor making join constraints | Ryuta Kamizono | 2017-05-23 | 1 | -23/+6 |
* | | | | | | | | | | | Merge pull request #29184 from kirs/nested-attributes-friendly-error | Matthew Draper | 2017-05-24 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |