| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #26004 from y-yagi/remove_unnecessary_require_and_extend | Santiago Pastorino | 2016-08-01 | 1 | -8/+0 |
|\ |
|
| * | remove unnecessary require and extend | yuuji.yaginuma | 2016-07-31 | 1 | -8/+0 |
* | | Merge pull request #26001 from yui-knk/warning | Kasper Timm Hansen | 2016-08-01 | 1 | -0/+1 |
|\ \ |
|
| * | | Suppress warnings | yui-knk | 2016-07-31 | 1 | -0/+1 |
| |/ |
|
* | | Merge pull request #26013 from y-yagi/remove_old_links_about_debugger | Kasper Timm Hansen | 2016-08-01 | 1 | -7/+0 |
|\ \
| |/
|/| |
|
| * | remove old links from debugging guide [ci skip] | yuuji.yaginuma | 2016-08-01 | 1 | -7/+0 |
|/ |
|
* | Merge pull request #25992 from rails/revert-25914-jm/not_in | David Heinemeier Hansson | 2016-07-29 | 4 | -81/+0 |
|\ |
|
| * | Revert "Adds `not_in?` onto Object" | David Heinemeier Hansson | 2016-07-29 | 4 | -81/+0 |
|/ |
|
* | Merge pull request #25965 from nicksieger/ac_test_case_reset_rack_input | Guillermo Iguaran | 2016-07-28 | 3 | -0/+23 |
|\ |
|
| * | Test that ActionDispatch::IntegrationTest does not leak parameters | Nick Sieger | 2016-07-28 | 1 | -0/+14 |
| * | Reset rack.input when the environment is scrubbed for the next request | Nick Sieger | 2016-07-27 | 2 | -0/+9 |
* | | Merge pull request #25941 from kamipo/finder_methods_uses_load_target | Rafael França | 2016-07-28 | 3 | -5/+7 |
|\ \ |
|
| * | | `FinderMethods` uses `records` (`load_target`) when `loaded?` is true | Ryuta Kamizono | 2016-07-28 | 3 | -5/+7 |
* | | | Merge pull request #25940 from kamipo/fix_collection_proxy_load | Rafael França | 2016-07-28 | 2 | -0/+14 |
|\ \ \ |
|
| * | | | Fix to `CollectionProxy#load` does `load_target` | Ryuta Kamizono | 2016-07-25 | 2 | -0/+14 |
| |/ / |
|
* | | | Merge pull request #25937 from kamipo/remove_prepare_binds_for_database | Rafael França | 2016-07-28 | 4 | -8/+4 |
|\ \ \ |
|
| * | | | Remove `prepare_binds_for_database` internal method | Ryuta Kamizono | 2016-07-28 | 4 | -8/+4 |
* | | | | Merge pull request #25340 from kamipo/prevent_table_comment_query | Rafael França | 2016-07-28 | 3 | -7/+17 |
|\ \ \ \ |
|
| * | | | | Prevent `table_comment` query if a table doesn't have a comment | Ryuta Kamizono | 2016-06-10 | 3 | -7/+17 |
* | | | | | 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 |