aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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]
| * | | | | | | | | Add missing nodocs and docs for ActionDispatch::Request [ci skip]Mehmet Emin İNAÇ2015-05-261-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add missing dot to end of the doc
* | | | | | | | | | Merge pull request #20309 from stephen-puiszis/patch-1Rafael Mendonça França2015-05-261-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add info on default layout functionality 3.2 >> 4.0 upgrade
| * | | | | | | | | | Add info on default layout functionality 3.2 >> 4.0 upgradeStephen Puiszis2015-05-261-0/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #20027 from keepcosmos/add-extend-option-on-habtmYves Senn2015-05-263-1/+20
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Add `extend` option on `has_and_belongs_to_many`.
| * | | | | | | | | add `extend` option on `has_and_belongs_to_many`.keepcosmos2015-05-263-1/+20
|/ / / / / / / / /
* | | | | | | | | Merge pull request #20303 from vngrs/remove_redundant_like_from_slice_docYves Senn2015-05-261-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove redundant 'like' from doc of slice! method [ci skip]
| * | | | | | | | | Remove redundant 'like' from doc of slice! method [ci skip]Mehmet Emin İNAÇ2015-05-261-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #20304 from arunagw/aa-remove-unused-variableYves Senn2015-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove unused variable
| * | | | | | | | | | Remove unused variableArun Agrawal2015-05-261-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was left in adfab2dcf4003ca564d78d4425566dd2d9cd8b4f
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 18:04:59 +0000