TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
43,776 Commits 2 Branches 0 Tags 294 MiB
9c4d31f601
Commit Graph

43776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rafael Mendonça França
9c4d31f601 Merge pull request #15140 from arthurnn/small_cleanup 
Remove unecessary require
 2014-05-16 17:44:03 -03:00
Arthur Neves
5bda6e0915
Remove unecessary require 2014-05-16 16:40:22 -04:00
Rafael Mendonça França
654be5f042 Merge pull request #15139 from zzak/habtm_build_model_name 
Remove the assignment for real this time.
 2014-05-16 15:52:48 -03:00
Zachary Scott
0372c5078a Remove the assignment for real this time. 
cc:
a11e2fcff8 (commitcomment-6353614)
and 0369dbf
 2014-05-16 11:48:17 -07:00
Rafael Mendonça França
0369dbfd42 prepend mutates the string so we can remove the assignment 2014-05-16 15:31:51 -03:00
Rafael Mendonça França
e5f840ca46 Reuse the force_clear_transaction_record_state 2014-05-16 15:20:01 -03:00
Rafael Mendonça França
78399ad726 Missed if 💣 2014-05-16 15:09:05 -03:00
Rafael Mendonça França
d89d859a41 Add a specific method to force the transaction record state clear 
We are using that code path in only one place so we should not add a
conditional to all the other cases. This will avoid performance
regressions on the old paths.
 2014-05-16 15:05:35 -03:00
Godfrey Chan
9900703ebf Merge pull request #15125 from arthurnn/small_refactoring_transaction_clear 
Small refactoring on clear_transaction_record_state
 2014-05-16 10:50:21 -07:00
Rafael Mendonça França
cb85ddc839 Merge pull request #15131 from arunagw/aa-cleanup-rakefile 
Remove code related to adapter which are no longer in repo
 2014-05-16 14:47:57 -03:00
Rafael Mendonça França
3acf28773b Merge pull request #15021 from hubertlepicki/allow_custom_host_in_asset_url 
Allow custom asset host to be passed in asset_url
 2014-05-16 13:31:20 -03:00
Guillermo Iguaran
8c48cd2206 Our test suite isn't ready to run in random order yet 😢 2014-05-16 11:18:38 -05:00
Arun Agrawal
0fcc1f9a61 Remove code related to adapter which are no longer in repo 
As we have remove code for these adapters so no need to have tasks
 2014-05-16 18:17:25 +02:00
Rafael Mendonça França
f3de18278e Merge pull request #15113 from leafac/document-schema-conflicts 
Document conflicts in `db/schema.rb` [ci skip]
 2014-05-16 13:11:33 -03:00
Leandro Facchinetti
b48bc869fa Document conflicts in db/schema.rb [ci skip] 2014-05-16 13:06:15 -03:00
Rafael Mendonça França
f7552e50ef Merge pull request #15133 from ShunsukeAida/master 
fixed a typo
 2014-05-16 12:56:42 -03:00
Aida
812b4e88b7 fixed a typo [ci skip] 2014-05-17 00:29:09 +09:00
Yves Senn
8109dc8067 formatting pass through CHANGELOGS. [ci skip] 2014-05-16 09:03:26 +02:00
Arthur Neves
535f299df9
Clear transaction state if callback raise rollback 2014-05-15 16:29:16 -04:00
Arthur Neves
e3d223bcce
Small refactoring on clear_transaction_record_state 
Make sure when we clean the `@_start_transaction_state` var we do it in
the same code-path.
Also this makes `clear_transaction_record_state`, more consistent with `restore_transaction_record_state`
 2014-05-15 16:29:16 -04:00
Rafael Mendonça França
16a8a68b7e Merge pull request #15118 from khelben/head_with_status_action_stack_level_too_deep 
fixes stack level too deep exception on action named 'status' rendering 'head :ok'
 2014-05-15 16:18:37 -03:00
Christiaan Van den Poel
20fece1491 fixes stack level too deep exception on action named 'status' returning 'head :ok' 2014-05-15 21:14:46 +02:00
Rafael Mendonça França
cf50bbd68c Merge pull request #15121 from skarpesh/rfc4791-methods 
Add RFC 4791 MKCALENDAR method
 2014-05-15 14:37:35 -03:00
Matthew Draper
1ad4b48991 Merge pull request #14791 from asn62/mysql_double_bug 
Changed extract_limit in class Column to return correct mysql float and
double limits
 2014-05-16 01:39:52 +09:30
Aaron Nelson
51de8cee82 Changed extract_limit in class Column to return correct mysql float and double limits 2014-05-16 01:39:24 +09:30
kasper
42728c70ee Add RFC4791 MKCALENDAR method 2014-05-15 17:41:37 +03:00
Santiago Pastorino
2367dfeb8d Revert "Remove ruby-head from allow_failures matrix" 
This reverts commit 5d2d301024cc0b17f26f6b454ac22a72f1db8a23.
 2014-05-15 11:04:56 -03:00
Santiago Pastorino
5d2d301024 Remove ruby-head from allow_failures matrix 2014-05-15 10:37:30 -03:00
Santiago Pastorino
ee239847b1 Merge pull request #15116 from tgxworld/remove_unused_method_in_test 
Remove unused method in RouteSet test.
 2014-05-15 08:35:37 -05:00
Yves Senn
0068dccfdc flexible ruby-oci8 version specification. [Gaurav Sharma] 
Follow up to #15109.

/cc @Gaurav2728
 2014-05-15 12:14:43 +02:00
Yves Senn
77a3cc4838 update ruby-oci8 version specification. Closes #15109. [ci skip] 
/cc @yahonda
 2014-05-15 12:11:41 +02:00
Guo Xiang Tan
30f93dc65e Remove unused method in RouteSet test. 2014-05-15 00:51:55 -07:00
Andrew White
e8059f562f Only path requirements are relevant to optimized urls 
The bit of URL generation that is optimized is the generation of
the path so things like :host, :port, etc. are irrelevant.
 2014-05-15 06:30:42 +01:00
Andrew White
ee8dc39ebe Add missing requires for require 'action_dispatch/routing' 2014-05-15 06:03:23 +01:00
Rafael Mendonça França
1961894d12 ✂️ 2014-05-14 22:27:59 -03:00
Rafael Mendonça França
f7aa2cc55f Methods of these modules are internal 
They should not be used on people application so they should not be
present on the API documentation.
 2014-05-14 22:27:20 -03:00
Rafael Mendonça França
095c42efcb Merge pull request #15088 from kares/shareable-modules 
[postgres] remove (outer) sub-class declarations with nested modules/classes
 2014-05-14 22:19:37 -03:00
Rafael Mendonça França
a11e2fcff8 Don't use Active Support where it is not needed. 
parent_name is a string of nil, never a blank string so we don't need to
use presence.
 2014-05-14 21:46:40 -03:00
Rafael Mendonça França
f85371f69d Merge pull request #14871 from kassio/kb-fixes-namespaced-habtm 
Fix how to compute class name on habtm namespaced.

Conflicts:
	activerecord/CHANGELOG.md
 2014-05-14 21:35:52 -03:00
Rafael Mendonça França
ec6bb33209 Merge pull request #15078 from nbudin/fix_merger_filter_binds_comparison_master 
Make filter_binds filter out symbols that are equal to strings

Conflicts:
	activerecord/CHANGELOG.md
 2014-05-14 20:29:30 -03:00
Nat Budin
1d316ac1fd Make filter_binds filter out symbols that are equal to strings 
ActiveRecord::Relation::Merger's filter_binds method does not filter out bind
variables when one of the attribute nodes has a string name, but the other has
a symbol name, even when those names are actually equal.

This can result in there being more bind variables than placeholders in the
generated SQL.  This is particularly an issue for PostgreSQL, where this is
treated as an error.

This patch changes the filter_binds method to make it convert both attribute
names to strings before comparing.
 2014-05-14 16:18:42 -07:00
Rafael Mendonça França
f2bff250a0 Merge pull request #14137 from dasch/better-fragment-cache-instrumentation 
Add controller and action name to the fragment caching instrumentation payload

Conflicts:
	actionpack/CHANGELOG.md
 2014-05-14 20:04:43 -03:00
Aaron Patterson
125cc780c5 Merge pull request #15070 from ayamomiji/sse-patch 
Add multiple lines message support for SSE module
 2014-05-14 14:02:04 -07:00
Yves Senn
09cfa3fa8a rake, remove frontbase related tasks from Active Record Rakefile. 2014-05-14 21:25:52 +02:00
Rafael Mendonça França
c279d0197a Merge pull request #15110 from kuldeepaggarwal/fix-warning 
remove warning `ambiguous first argument; put parentheses or even spaces`
 2014-05-14 15:44:23 -03:00
Kuldeep Aggarwal
bf68ccc71d remove warning ambiguous first argument; put parentheses or even spaces 2014-05-15 00:12:21 +05:30
Rafael Mendonça França
96da5e73df Merge pull request #15074 from kuldeepaggarwal/docs-changes 
Add missing information, ref[#522c0fd]
 2014-05-14 15:42:09 -03:00
Rafael Mendonça França
1560370c3c Merge pull request #15108 from arthurnn/i18n_master 
Use i18n master to run tests
 2014-05-14 15:04:27 -03:00
Rafael Mendonça França
89836f977b Merge pull request #15096 from robin850/patch-20 
Update Redcarpet to 3.1.2
 2014-05-14 14:59:20 -03:00
Kuldeep Aggarwal
5fc9dff883 [ci skip]add updated information, ref[#522c0fd] 2014-05-14 23:26:42 +05:30