aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ci skip] Fix block parameter of assert_no_differenceHiromichi Yamada2015-05-281-1/+1
|
* Merge pull request #20332 from henders/shender/changelog_reload_creditArun Agrawal2015-05-281-2/+2
|\ | | | | Give credit to extra contributor for Base.reload fix
| * Give credit to extra contributor for Base.reload fixShane Hender2015-05-281-2/+2
|/
* Merge pull request #20196 from huoxito/preload-association-and-mergesRafael Mendonça França2015-05-282-2/+50
|\ | | | | Properly append preload / includes args on Merger
| * Properly append preload / includes args on MergerWashington Luiz2015-05-282-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Couldn't find other way to get the association name from a given class other than looping through `reflect_on_all_associations` reflections .. Noticed this one while looking at this example: ```ruby class Product < ActiveRecord::Base has_many :variants has_many :translations end class Translation < ActiveRecord::Base belongs_to :product end class Variant < ActiveRecord::Base belongs_to :product end class BugTest < Minitest::Test def test_merge_stuff product = Product.create! name: 'huhu' variant = Variant.create! product_id: product.id Translation.create! locale: 'en', product_id: product.id product_relation = Product.all .preload(:translations) .joins(:translations) .merge(Translation.where(locale: 'en')) .where(name: 'huhu') assert_equal variant, Variant.joins(:product).merge(product_relation).first end end ```
* | Merge pull request #20263 from arunagw/aa-remove-custom-lines-actionviewRafael Mendonça França2015-05-281-21/+3
|\ \ | | | | | | Remove custom `lines` and use `/tools/line_statistics`
| * | Remove custom `lines` and use `/tools/line_statistics`Arun Agrawal2015-05-221-21/+3
| | |
* | | Merge pull request #20041 from akshay-vishnoi/sqlite_collationRafael Mendonça França2015-05-286-9/+139
|\ \ \ | | | | | | | | | | | | SQLite3: Add collation support for string and text columns
| * | | Add collation support for string and text columns in SQLite3Akshay Vishnoi2015-05-286-9/+139
| | | |
* | | | Add test to 57daaefRafael Mendonça França2015-05-281-1/+1
| | | |
* | | | Allow Relation#compact using delegationJordan Raine2015-05-281-1/+1
|/ / /
* | | Merge pull request #20329 from EduardoBautista/json-api-supportRafael Mendonça França2015-05-271-1/+1
|\ \ \ | | | | | | | | Add application/vnd.api+json alias to the JSON MIME Type.
| * | | Add application/vnd.api+json alias to the JSON MIME Type.Eduardo Bautista2015-05-271-1/+1
| | |/ | |/|
* | | Merge pull request #20171 from georgeclaghorn/enums-in-fixturesRafael Mendonça França2015-05-276-32/+64
|\ \ \ | | | | | | | | | | | | Allow the use of symbols or strings to specify enum values in test fixtures
| * | | Resolve enums in test fixturesGeorge Claghorn2015-05-276-32/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, values for columns backing Active Record enums must be specified as integers in test fixtures: awdr: title: "Agile Web Development with Rails" status: 2 rfr: title: "Ruby for Rails" status: <%= Book.statuses[:proposed] %> This is potentially confusing, since enum values are typically specified as symbols or strings in application code. To resolve the confusion, this change permits the use of symbols or strings to specify enum values: awdr: status: :published It is compatible with fixtures that specify enum values as integers.
* | | | Merge pull request #19886 from henders/henders/reload_wipe_query_cacheRafael Mendonça França2015-05-273-1/+34
|\ \ \ \ | | | | | | | | | | | | | | | Cause ActiveRecord::Base::reload to also ignore the QueryCache.
| * | | | Cause ActiveRecord::Base::reload to also ignore the QueryCache.Shane Hender2015-04-282-1/+30
| | | | |
* | | | | Merge pull request #17654 from kamipo/strict_mode_explicitlyRafael Mendonça França2015-05-273-2/+22
|\ \ \ \ \ | |_|/ / / |/| | | | If specify `strict: :default` explicitly, do not set sql_mode.
| * | | | If specify `strict: :default` explicitly, do not set sql_mode.Ryuta Kamizono2015-05-263-2/+22
| | | | | | | | | | | | | | | | | | | | Related with #17370.
* | | | | Merge pull request #20269 from wojobucco/masterRafael Mendonça França2015-05-273-4/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Changed mysqldump to include sprocs and functions
| * | | | | Changed mysqldump to include sprocs and functionsJonathan Worek2015-05-222-4/+5
| | | | | |
* | | | | | Merge pull request #20326 from hderms/dh/fix_task_bugRafael Mendonça França2015-05-272-16/+66
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix rake method definition leaking onto Object
| * | | | | | add fixed fileDermot Haughey2015-05-272-16/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add framework_test add another test
* | | | | | | :bomb: Fix another leftoverRafael Mendonça França2015-05-271-1/+1
| | | | | | |
* | | | | | | Fix file nameRafael Mendonça França2015-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a leftover of #19867
* | | | | | | Merge pull request #19808 from byroot/action-parameterRafael Mendonça França2015-05-272-15/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [PoC] Stop shadowing parameters named `action`
| * | | | | | | Allow to parameters named `action` or `controller` from AC::TestCase helpersJean Boussier2015-04-182-15/+32
| | | | | | | |
* | | | | | | | Merge pull request #19867 from radar/rename-app-rails-loaderRafael Mendonça França2015-05-274-14/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove redundant 'Rails' from Rails::AppRailsLoader constant
| * | | | | | | | Remove redundant 'Rails' from Rails::AppRailsLoader constantRyan Bigg2015-05-214-14/+14
| | | | | | | | |
* | | | | | | | | Merge pull request #20327 from yoongkang/ajaxZachary Scott2015-05-271-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | [ci-skip] Replace dead link about HttpOnly cookies.
| * | | | | | | | [ci skip] Replace dead link about HttpOnly cookies.Yoong Kang Lim2015-05-281-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #20316 from ↵Rafael Mendonça França2015-05-271-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vngrs/add_assertion_for_get_method_into_request_test Add assertion for get? method into test cases
| * | | | | | | | | Add assertion for get? method into test casesMehmet Emin İNAÇ2015-05-271-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #20321 from vngrs/fix_indentation_warningRafael Mendonça França2015-05-271-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix indentation warning on active_support ordered_options
| * | | | | | | | | | Fix indentation warning on active_support ordered_optionsMehmet Emin İNAÇ2015-05-271-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #20323 from jakegavin/initialization-guide-updateClaudio B.2015-05-271-3/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary reference to example Blog app in initialization guides
| * | | | | | | | | | | Remove unnecessary reference to example Blog app [ci skip]Jake Gavin2015-05-271-3/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #20319 from kassio/masterRafael Mendonça França2015-05-271-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Remove web-console and spring from test group on default Gemfile.
| * | | | | | | | | | Remove web-console and spring from test group on default Gemfile.Kassio Borges2015-05-271-2/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #20314 from vngrs/add_doc_about_form_data_methodSantiago Pastorino2015-05-271-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Documentation for ActionDispatch::Request form_data? method [ci skip]
| * | | | | | | | | Documentation for ActionDispatch::Request form_data? method [ci skip]Mehmet Emin İNAÇ2015-05-271-0/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #20262 from arunagw/aa-remove-broken-unused-release-taskYves Senn2015-05-278-60/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Remove broken and unused release task
| * | | | | | | | Remove broken and unused release taskArun Agrawal2015-05-228-60/+0
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We do release with release.rb - There is no `rake/gemcutter`
* | | | | | | | Merge pull request #20297 from gouravtiwari/patch-9Claudio B.2015-05-261-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added multibyte slice! example to doc [ci skip]
| * | | | | | | | Added multibyte slice! example to doc [ci skip]Gourav Tiwari2015-05-261-0/+6
| | | | | | | | |
* | | | | | | | | Merge pull request #20310 from guigs/patch-1Rafael Mendonça França2015-05-261-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix email with name format in Guides. [ci skip]
| * | | | | | | | | Fix email with name format in Guides. [ci skip]Guilherme Goettems Schneider2015-05-261-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #20208 from gaurish/raise_on_missing_ordered_optionsRafael Mendonça França2015-05-263-1/+39
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add bang version to OrderedOptions
| * | | | | | | | | Add bang version to OrderedOptionsGaurish Sharma2015-05-233-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By: Aditya Sanghi(@asanghi) Gaurish Sharma(gaurish)
* | | | | | | | | | Merge pull request #20305 from ↵Rafael Mendonça França2015-05-261-3/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | vngrs/missing_docs_and_no_docs_for_action_dispatch_request Add missing nodocs and docs for ActionDispatch::Request [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-22 14:08:30 +0000