aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Remove unnecessary methods for `NullRelation`Ryuta Kamizono2016-07-291-29/+7
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #26004 from y-yagi/remove_unnecessary_require_and_extendSantiago Pastorino2016-08-011-8/+0
|\ \ \ \ \ \
| * | | | | | remove unnecessary require and extendyuuji.yaginuma2016-07-311-8/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #26001 from yui-knk/warningKasper Timm Hansen2016-08-011-0/+1
|\ \ \ \ \ \
| * | | | | | Suppress warningsyui-knk2016-07-311-0/+1
| |/ / / / /
* | | | | | Merge pull request #26013 from y-yagi/remove_old_links_about_debuggerKasper Timm Hansen2016-08-011-7/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | remove old links from debugging guide [ci skip]yuuji.yaginuma2016-08-011-7/+0
|/ / / / /
* | | | | Merge pull request #25992 from rails/revert-25914-jm/not_inDavid Heinemeier Hansson2016-07-294-81/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Revert "Adds `not_in?` onto Object"David Heinemeier Hansson2016-07-294-81/+0
|/ / / /
* | | | Merge pull request #25965 from nicksieger/ac_test_case_reset_rack_inputGuillermo Iguaran2016-07-283-0/+23
|\ \ \ \
| * | | | Test that ActionDispatch::IntegrationTest does not leak parametersNick Sieger2016-07-281-0/+14
| * | | | Reset rack.input when the environment is scrubbed for the next requestNick Sieger2016-07-272-0/+9
* | | | | Merge pull request #25941 from kamipo/finder_methods_uses_load_targetRafael França2016-07-283-5/+7
|\ \ \ \ \
| * | | | | `FinderMethods` uses `records` (`load_target`) when `loaded?` is trueRyuta Kamizono2016-07-283-5/+7
* | | | | | Merge pull request #25940 from kamipo/fix_collection_proxy_loadRafael França2016-07-282-0/+14
|\ \ \ \ \ \
| * | | | | | Fix to `CollectionProxy#load` does `load_target`Ryuta Kamizono2016-07-252-0/+14
| |/ / / / /
* | | | | | Merge pull request #25937 from kamipo/remove_prepare_binds_for_databaseRafael França2016-07-284-8/+4
|\ \ \ \ \ \
| * | | | | | Remove `prepare_binds_for_database` internal methodRyuta Kamizono2016-07-284-8/+4
* | | | | | | Merge pull request #25340 from kamipo/prevent_table_comment_queryRafael França2016-07-283-7/+17
|\ \ \ \ \ \ \
| * | | | | | | Prevent `table_comment` query if a table doesn't have a commentRyuta Kamizono2016-06-103-7/+17
* | | | | | | | Merge pull request #25974 from kamipo/avoid_calling_current_database_in_table...Rafael França2016-07-281-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid calling `current_database` in `table_comment`Ryuta Kamizono2016-07-281-2/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #25973 from kamipo/should_freeze_quoted_column_table_names...Matthew Draper2016-07-283-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | `@quoted_{column,table}_names` should cache a frozen stringRyuta Kamizono2016-07-283-5/+5
|/ / / / / / /
* | | | | | | Merge pull request #25948 from chetna1726/docsRafael França2016-07-281-0/+1
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Add documentation for error using select with orderChetna Sharma2016-07-251-0/+1
* | | | | | | | Merge pull request #25961 from Azzurrio/masterRafael França2016-07-284-1/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix accessing provider_job_id inside active jobs for sidekiq adapterAzzurrio2016-07-284-1/+18
* | | | | | | | | Merge pull request #25952 from harfangk/masterप्रथमेश Sonpatki2016-07-281-19/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated getting_started guide to reflect the change in error message for Acti...Bonghyun Kim2016-07-281-19/+14
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Do not require rb-inotifyRafael Mendonça França2016-07-271-1/+1
* | | | | | | | | Use a form of rb-inotify to fix broken tests with Ruby 2.2.5Rafael Mendonça França2016-07-272-2/+12
* | | | | | | | | Merge pull request #25767 from kamipo/association_name_is_the_same_as_join_ta...Rafael França2016-07-274-3/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Correctly return `associated_table` when `associated_with?` is trueRyuta Kamizono2016-07-104-3/+20
* | | | | | | | | | Add the TABLE_SCHEMA condition to the SELECT statement in table_comment (#25945)Takeshi AKIMA2016-07-272-1/+6
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #25702 from k0kubun/joins-circular-referenceSean Griffin2016-07-272-1/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove circular join references in join_dependencyTakashi Kokubun2016-07-282-1/+10
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #25963 from bdewater/auth_tag_docRafael França2016-07-271-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add rationale for manually checking auth_tag length, which got lost when #258...Bart de Water2016-07-271-0/+4
| |/ / / / / / / /
* | | | | | | | | Merge pull request #25913 from chrisarcand/fix-keyed-defaults-with-rootRafael Mendonça França2016-07-273-1/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update changelogChris Arcand2016-07-261-0/+7
| * | | | | | | | | Fix 'defaults' option for root routeChris Arcand2016-07-212-1/+26
* | | | | | | | | | Generators and tests are under the same style rulesRafael Mendonça França2016-07-271-14/+0
* | | | | | | | | | Bump arelRafael Mendonça França2016-07-271-2/+2
* | | | | | | | | | Merge pull request #25938 from kamipo/decouple_statement_cache_from_connectio...Rafael França2016-07-272-10/+10
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Decouple statement cache from connection adapterRyuta Kamizono2016-07-242-10/+10
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #25958 from kamipo/should_be_target_loadedYves Senn2016-07-271-0/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add an assertion to the tests that should be loaded the target.Ryuta Kamizono2016-07-271-0/+38
* | | | | | | | | | Merge pull request #25408 from kamipo/should_not_reuse_quoted_trueYves Senn2016-07-273-5/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Quoting booleans should return a frozen stringRyuta Kamizono2016-07-273-5/+21