Commit Graph

51576 Commits

Author SHA1 Message Date
Eduardo Bautista
50b66313ad Add application/vnd.api+json alias to the JSON MIME Type. 2015-05-27 21:51:04 -05:00
Rafael Mendonça França
1ed92a2ee1 Merge pull request #19886 from henders/henders/reload_wipe_query_cache
Cause ActiveRecord::Base::reload to also ignore the QueryCache.
2015-05-27 23:45:55 -03:00
Rafael Mendonça França
c68e45dd3b Merge pull request #17654 from kamipo/strict_mode_explicitly
If specify `strict: :default` explicitly, do not set sql_mode.
2015-05-27 23:35:05 -03:00
George Claghorn
908cfef6e2 Resolve enums in test fixtures
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.
2015-05-27 21:48:58 -04:00
Rafael Mendonça França
27fdf4591d Merge pull request #20269 from wojobucco/master
Changed mysqldump to include sprocs and functions
2015-05-27 22:43:23 -03:00
Rafael Mendonça França
a75f6cfb1b Merge pull request #20326 from hderms/dh/fix_task_bug
Fix rake method definition leaking onto Object
2015-05-27 22:19:57 -03:00
Rafael Mendonça França
4b606d0713 💣 Fix another leftover 2015-05-27 21:59:00 -03:00
Rafael Mendonça França
6b1e67e1a1 Fix file name
This is a leftover of #19867
2015-05-27 21:48:01 -03:00
Rafael Mendonça França
f02f287242 Merge pull request #19808 from byroot/action-parameter
[PoC] Stop shadowing parameters named `action`
2015-05-27 21:43:45 -03:00
Rafael Mendonça França
99c042b3cc Merge pull request #19867 from radar/rename-app-rails-loader
Remove redundant 'Rails' from Rails::AppRailsLoader constant
2015-05-27 21:41:06 -03:00
Zachary Scott
7a9651cf1b Merge pull request #20327 from yoongkang/ajax
[ci-skip] Replace dead link about HttpOnly cookies.
2015-05-27 17:36:31 -07:00
Yoong Kang Lim
ad6e508039 [ci skip] Replace dead link about HttpOnly cookies. 2015-05-28 10:35:54 +10:00
Dermot Haughey
ae5c3c3514 add fixed file
add framework_test

add another test
2015-05-27 19:24:47 -05:00
Rafael Mendonça França
3e36db4406 Merge pull request #20316 from vngrs/add_assertion_for_get_method_into_request_test
Add assertion for get? method into test cases
2015-05-27 18:05:05 -03:00
Rafael Mendonça França
1f8a9d953d Merge pull request #20321 from vngrs/fix_indentation_warning
Fix indentation warning on active_support ordered_options
2015-05-27 18:02:30 -03:00
Claudio B.
ffa20f1479 Merge pull request #20323 from jakegavin/initialization-guide-update
Remove unnecessary reference to example Blog app in initialization guides
2015-05-27 12:48:24 -07:00
Jake Gavin
c9f05c92a5 Remove unnecessary reference to example Blog app [ci skip] 2015-05-27 12:24:06 -07:00
Rafael Mendonça França
8acf0cc382 Merge pull request #20319 from kassio/master
Remove web-console and spring from test group on default Gemfile.
2015-05-27 15:08:47 -03:00
Kassio Borges
ac8356eb22 Remove web-console and spring from test group on default Gemfile. 2015-05-27 14:58:05 -03:00
Mehmet Emin İNAÇ
8b7bb52bed Fix indentation warning on active_support ordered_options 2015-05-27 20:56:33 +03:00
Santiago Pastorino
4a7bf07f7e Merge pull request #20314 from vngrs/add_doc_about_form_data_method
Documentation for ActionDispatch::Request form_data? method [ci skip]
2015-05-27 10:04:28 -03:00
Mehmet Emin İNAÇ
01d4e060e2 Add assertion for get? method into test cases 2015-05-27 15:54:56 +03:00
Mehmet Emin İNAÇ
98dd795c01 Documentation for ActionDispatch::Request form_data? method [ci skip] 2015-05-27 15:43:42 +03:00
Yves Senn
852460852c Merge pull request #20262 from arunagw/aa-remove-broken-unused-release-task
Remove broken and unused release task
2015-05-27 09:14:19 +02:00
Ryuta Kamizono
7961f4f776 If specify strict: :default explicitly, do not set sql_mode.
Related with #17370.
2015-05-26 17:44:24 -07:00
Claudio B.
8887449354 Merge pull request #20297 from gouravtiwari/patch-9
Added multibyte slice! example to doc [ci skip]
2015-05-26 11:21:18 -07:00
Rafael Mendonça França
79fb8f3593 Merge pull request #20310 from guigs/patch-1
Fix email with name format in Guides. [ci skip]
2015-05-26 13:54:03 -03:00
Guilherme Goettems Schneider
ac6180ec1b Fix email with name format in Guides. [ci skip] 2015-05-26 13:49:41 -03:00
Rafael Mendonça França
b1f6be9b5e Merge pull request #20208 from gaurish/raise_on_missing_ordered_options
Add bang version to OrderedOptions
2015-05-26 13:21:28 -03:00
Rafael Mendonça França
58ed699376 Merge pull request #20305 from vngrs/missing_docs_and_no_docs_for_action_dispatch_request
Add missing nodocs and docs for ActionDispatch::Request [ci skip]
2015-05-26 13:16:35 -03:00
Mehmet Emin İNAÇ
096bc4be6b Add missing nodocs and docs for ActionDispatch::Request [ci skip]
add missing dot to end of the doc
2015-05-26 19:14:04 +03:00
Rafael Mendonça França
290c9e3bd0 Merge pull request #20309 from stephen-puiszis/patch-1
Add info on default layout functionality 3.2 >> 4.0 upgrade
2015-05-26 12:20:22 -03:00
Stephen Puiszis
a48b4ea1a3 Add info on default layout functionality 3.2 >> 4.0 upgrade 2015-05-26 09:59:24 -05:00
Yves Senn
a19200d7bd Merge pull request #20027 from keepcosmos/add-extend-option-on-habtm
Add `extend` option on `has_and_belongs_to_many`.
2015-05-26 15:23:35 +02:00
keepcosmos
995a473f0c add extend option on has_and_belongs_to_many. 2015-05-26 22:06:53 +09:00
Yves Senn
31cc1c2ef3 Merge pull request #20303 from vngrs/remove_redundant_like_from_slice_doc
Remove redundant 'like' from doc of slice! method [ci skip]
2015-05-26 11:10:39 +02:00
Yves Senn
e5a3952e50 Merge pull request #20304 from arunagw/aa-remove-unused-variable
Remove unused variable
2015-05-26 11:10:04 +02:00
Arun Agrawal
e56bdf3663 Remove unused variable
Was left in adfab2dcf4003ca564d78d4425566dd2d9cd8b4f
2015-05-26 11:04:47 +02:00
Yves Senn
adfab2dcf4 deprecate Relation#uniq use Relation#distinct instead.
See #9683 for the reasons we switched to `distinct`.

Here is the discussion that triggered the actual deprecation #20198.

`uniq`, `uniq!` and `uniq_value` are still around.
They will be removed in the next minor release after Rails 5.
2015-05-26 10:35:14 +02:00
Mehmet Emin İNAÇ
4355725cdc Remove redundant 'like' from doc of slice! method [ci skip] 2015-05-26 10:53:05 +03:00
Yves Senn
b8c31fd9b9 Merge pull request #16938 from akshay-vishnoi/remove-deprication
Remove `.superclass_delegating_accessor`.
2015-05-26 09:26:55 +02:00
Gourav Tiwari
379e07e06c Added multibyte slice! example to doc [ci skip] 2015-05-26 06:08:04 +00:00
Matthew Draper
2d261ba43c Merge pull request #20296 from vngrs/use_memoization_to_minimize_memory_usage
Use memoization while accessing request headers for minimizing memory usage
2015-05-26 03:36:38 +09:30
Mehmet Emin İNAÇ
b197a1adc5 Use memoization while accessing request headers for minimizing memory usage 2015-05-25 20:07:46 +03:00
Abdelkader Boudih
88c883b2f9 Merge pull request #20295 from rohandaxini/patch-1
Fixed the grammatical mistake in the sentence [ci skip]
2015-05-25 16:39:22 +01:00
Rohan Daxini
498ff4800a Fixed the grammatical mistake in the sentence [ci skip] 2015-05-25 21:05:46 +05:30
Rafael Mendonça França
5e92f9022f Merge pull request #20248 from ronakjangir47/remove_mocha
Remove use of mocha in the railties generators tests
2015-05-25 11:01:02 -03:00
Rafael Mendonça França
f4fb48365b Merge pull request #20294 from yoongkang/american_spelling
Fix spelling mistakes
2015-05-25 10:47:04 -03:00
Kasper Timm Hansen
7a08b2c4c0 Merge pull request #20293 from davydovanton/doc-duration
Update documentation for Duration#to_s
2015-05-25 15:45:41 +02:00
Anton Davydov
2c725896b2 [skip ci] Update documentation for Duration#to_s 2015-05-25 16:36:37 +03:00