Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge pull request #25974 from kamipo/avoid_calling_current_database_in_table... | Rafael França | 2016-07-28 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Avoid calling `current_database` in `table_comment` | Ryuta Kamizono | 2016-07-28 | 1 | -2/+4 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #25973 from kamipo/should_freeze_quoted_column_table_names... | Matthew Draper | 2016-07-28 | 3 | -5/+5 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | `@quoted_{column,table}_names` should cache a frozen string | Ryuta Kamizono | 2016-07-28 | 3 | -5/+5 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #25948 from chetna1726/docs | Rafael França | 2016-07-28 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [ci skip] Add documentation for error using select with order | Chetna Sharma | 2016-07-25 | 1 | -0/+1 | |
* | | | | | | | | Merge pull request #25961 from Azzurrio/master | Rafael França | 2016-07-28 | 4 | -1/+18 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix accessing provider_job_id inside active jobs for sidekiq adapter | Azzurrio | 2016-07-28 | 4 | -1/+18 | |
* | | | | | | | | | Merge pull request #25952 from harfangk/master | प्रथमेश Sonpatki | 2016-07-28 | 1 | -19/+14 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Updated getting_started guide to reflect the change in error message for Acti... | Bonghyun Kim | 2016-07-28 | 1 | -19/+14 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Do not require rb-inotify | Rafael Mendonça França | 2016-07-27 | 1 | -1/+1 | |
* | | | | | | | | | Use a form of rb-inotify to fix broken tests with Ruby 2.2.5 | Rafael Mendonça França | 2016-07-27 | 2 | -2/+12 | |
* | | | | | | | | | Merge pull request #25767 from kamipo/association_name_is_the_same_as_join_ta... | Rafael França | 2016-07-27 | 4 | -3/+20 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Correctly return `associated_table` when `associated_with?` is true | Ryuta Kamizono | 2016-07-10 | 4 | -3/+20 | |
* | | | | | | | | | | Add the TABLE_SCHEMA condition to the SELECT statement in table_comment (#25945) | Takeshi AKIMA | 2016-07-27 | 2 | -1/+6 | |
| |_|/ / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #25702 from k0kubun/joins-circular-reference | Sean Griffin | 2016-07-27 | 2 | -1/+10 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove circular join references in join_dependency | Takashi Kokubun | 2016-07-28 | 2 | -1/+10 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #25963 from bdewater/auth_tag_doc | Rafael França | 2016-07-27 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add rationale for manually checking auth_tag length, which got lost when #258... | Bart de Water | 2016-07-27 | 1 | -0/+4 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #25913 from chrisarcand/fix-keyed-defaults-with-root | Rafael Mendonça França | 2016-07-27 | 3 | -1/+33 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Update changelog | Chris Arcand | 2016-07-26 | 1 | -0/+7 | |
| * | | | | | | | | | Fix 'defaults' option for root route | Chris Arcand | 2016-07-21 | 2 | -1/+26 | |
* | | | | | | | | | | Generators and tests are under the same style rules | Rafael Mendonça França | 2016-07-27 | 1 | -14/+0 | |
* | | | | | | | | | | Bump arel | Rafael Mendonça França | 2016-07-27 | 1 | -2/+2 | |
* | | | | | | | | | | Merge pull request #25938 from kamipo/decouple_statement_cache_from_connectio... | Rafael França | 2016-07-27 | 2 | -10/+10 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Decouple statement cache from connection adapter | Ryuta Kamizono | 2016-07-24 | 2 | -10/+10 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #25958 from kamipo/should_be_target_loaded | Yves Senn | 2016-07-27 | 1 | -0/+38 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add an assertion to the tests that should be loaded the target. | Ryuta Kamizono | 2016-07-27 | 1 | -0/+38 | |
* | | | | | | | | | | Merge pull request #25408 from kamipo/should_not_reuse_quoted_true | Yves Senn | 2016-07-27 | 3 | -5/+21 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Quoting booleans should return a frozen string | Ryuta Kamizono | 2016-07-27 | 3 | -5/+21 | |
* | | | | | | | | | | | There are some cases where @@app is not defined | Santiago Pastorino | 2016-07-26 | 3 | -20/+33 | |
* | | | | | | | | | | | Merge pull request #25523 from kamipo/extract_quoted_binds_type_casted_binds | Sean Griffin | 2016-07-26 | 4 | -6/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Extract `type_casted_binds` method | Ryuta Kamizono | 2016-07-26 | 4 | -6/+10 | |
* | | | | | | | | | | | | Be more explicit with the expected result | Santiago Pastorino | 2016-07-26 | 1 | -1/+1 | |
* | | | | | | | | | | | | Return ActionDispatch.test_app when no app is set on IntegrationTest.app method | Santiago Pastorino | 2016-07-26 | 2 | -1/+20 | |
* | | | | | | | | | | | | Merge pull request #25919 from benpickles/skip-javascript-also-skips-uglifier | Guillermo Iguaran | 2016-07-26 | 4 | -3/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | A generated app should not include Uglifier with `--skip-javascript` option. | Ben Pickles | 2016-07-26 | 4 | -3/+18 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #25912 from stevenharman/fix_render_partial_collection_to_... | Santiago Pastorino | 2016-07-26 | 3 | -1/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Use to_a to pre-buffer the collection | Steven Harman | 2016-07-26 | 2 | -8/+7 | |
| * | | | | | | | | | | | Default to an empty collection if falsey given | Steven Harman | 2016-07-26 | 1 | -1/+1 | |
| * | | | | | | | | | | | Use Ruby >= 1.9 hash syntax as is the preference | Steven Harman | 2016-07-26 | 1 | -1/+1 | |
| * | | | | | | | | | | | Fix collection_from_options to allow Enumerators | Steven Harman | 2016-07-26 | 3 | -1/+21 | |
* | | | | | | | | | | | | Merge pull request #25929 from kamipo/load_target_is_public_method | Santiago Pastorino | 2016-07-26 | 3 | -7/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | `load_target` is a public method | Ryuta Kamizono | 2016-07-23 | 3 | -7/+5 | |
* | | | | | | | | | | | | Merge pull request #25953 from kamipo/make_force_signal37_to_load_all_clients... | Santiago Pastorino | 2016-07-26 | 1 | -4/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Make `force_signal37_to_load_all_clients_of_firm` to private | Ryuta Kamizono | 2016-07-26 | 1 | -4/+6 | |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #25936 from prathamesh-sonpatki/bump-arel | Santiago Pastorino | 2016-07-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Bump Arel to fix few failing tests on Ruby 2.4 related to the Integer unifica... | Prathamesh Sonpatki | 2016-07-24 | 1 | -1/+1 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #25950 from jules2689/master | Rafael França | 2016-07-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Also yield in parameters for a nil content_mime_type | Julian Nadeau | 2016-07-25 | 1 | -1/+1 | |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | |