TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
56,319 Commits 2 Branches 0 Tags 294 MiB
bef16522db
Commit Graph

56319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vijay Dev
bef16522db Merge branch 'master' of github.com:rails/docrails 2016-02-07 07:14:50 +00:00
Vijay Dev
87f060a7ee fix indentation 2016-02-07 07:12:16 +00:00
Jon Moss
5b1f3e5b75 Merge pull request #23533 from y-yagi/fix_typo_in_assert_enqueued_jobs_example 
fix typo in `assert_enqueued_jobs` example [ci skip]
 2016-02-06 19:48:16 -05:00
yuuji.yaginuma
6809758bc6 fix typo in assert_enqueued_jobs example [ci skip] 2016-02-07 09:12:19 +09:00
Sean Griffin
8526e9bed2 Merge pull request #23519 from kamipo/mariadb_does_not_support_json_type 
MariaDB does not support JSON type
 2016-02-06 14:44:45 -07:00
Kasper Timm Hansen
4e4bcae084 Avoid coupling Action Pack to Railties. 
Referencing Rails.env without checking if it's defined couples
us to Railties.

Fix by avoiding the line breaks if we don't have an env check
to rely on.
 2016-02-06 22:28:59 +01:00
Rafael França
495ec33d08 Merge pull request #23529 from syamilmj/remove_unused_method 
Remove unused private method
 2016-02-06 18:47:48 -02:00
Syamil MJ
04021c4b78 Remove unused private method 2016-02-07 04:07:48 +08:00
Sean Griffin
f611e59cb1 Merge pull request #23520 from kamipo/remove_duplicated_require_arel 
Remove duplicated `require 'arel'`
 2016-02-06 08:18:16 -07:00
Ryuta Kamizono
d9bdc2f9ef MariaDB does not support JSON type 
Fixes #22980.
 2016-02-06 23:14:41 +09:00
Eileen M. Uchitelle
b9a95456a5 Merge pull request #23517 from gsamokovarov/yay-youre-on-rails 
Replace old Rails greeting references
 2016-02-06 08:45:15 -05:00
Ryuta Kamizono
4ca3f99d4c Remove duplicated require 'arel' 
It appears first in `lib/active_record.rb`.
 2016-02-06 17:51:03 +09:00
Kasper Timm Hansen
c909a00607 Merge pull request #23513 from kamipo/revert-23502-update-travis-master 
Revert "No need to specify Ruby patch version on Travis CI"
 2016-02-06 09:01:09 +01:00
Kasper Timm Hansen
c2b47916aa Merge pull request #23514 from y-yagi/revert_mailer_doc_fix 
Revert "When generating a mailer, you must specify Mailer in the class name in"
 2016-02-06 09:00:07 +01:00
Genadi Samokovarov
91678fe9f7 Replace old Rails greeting references 
A couple of the READMEs were still referring the old welcome page. This
is a small change that goes over it.

[ci skip]
 2016-02-06 09:14:42 +02:00
Ryuta Kamizono
ecd8f8f0ed Revert "No need to specify Ruby patch version on Travis CI" 2016-02-06 15:34:20 +09:00
yuuji.yaginuma
ea785e535e Revert "When generating a mailer, you must specify Mailer in the class name in" 
This reverts commit 8417d967e016f0219cc4ec30bf0d3908ce6cd29b.

In 5697bdbb6da5d08e541a3b12251cec90269b059b and af3eb5961e55a46b011be797e71f615f20f56686,
add mailer suffix to generated files and classes.
Therefore, no longer need to specify `Mailer` to class name. [ci skip]
 2016-02-06 15:02:02 +09:00
yui-knk
3ee7bc87b1 [ci skip] Good bye SQLite2 
Follow up of c9feea6c9a
 2016-02-06 14:01:07 +09:00
Aaron Patterson
38b5af6595 add missing require 2016-02-05 13:44:08 -08:00
Kasper Timm Hansen
84b72a812f Fix mixing line filters with Minitest's -n filter. 
Previous commit accidentally broke mixing line filters with string -n filter.

Fix by checking if it is a string and returning it.

We also need to ensure the -n filter carry forward into any other composite filters.

Fix by letting the named filter be extractable, so we'll keep this for the next runnable's
run.
 2016-02-05 21:53:27 +01:00
Sean Griffin
d666a5a5cf Revert "Dump indexes in create_table instead of add_index" 
This reverts commit 99801c6a7b69eb4b006a55de17ada78f3a0fa4c1.

Ultimately it doesn't matter whether `add_index` or `t.index` are used
in the schema dumper in any meaningful way. There are gems out there
which hook into the old behavior for things like indexing materialized
views. Since the reverted commit doesn't seem to add much benefit,
there's no reason for us to break these gems.
 2016-02-05 13:33:48 -07:00
Rafael França
7ea174e6d5 Merge pull request #23502 from sikachu/update-travis-master 
No need to specify Ruby patch version on Travis CI
 2016-02-05 18:29:06 -02:00
Prem Sichanugrist
4dd0cddc43 No need to specify Ruby patch version on Travis CI 
Travis CI now select the latest patch version of Ruby automatically when
given MAJOR.MINOR version string.
 2016-02-05 15:00:37 -05:00
Aaron Patterson
a640da454f disable controller / view thread spawning in tests 
Tests can (and do) access the database from the main thread.  In this
case they were starting a transaction, then making a request.  The
request would create a new thread, which would allocate a new database
connection.  Since the main thread started a transaction that contains
data that the new thread wants to see, the new thread would not see it
due to data visibility from transactions.  Spawning the new thread in
production is fine because middleware should not be doing database
manipulation similar to the test harness.  Before 603fe20c it was
possible to set the database connection id based on a thread local, but
603fe20c changes the connection lookup code to never look at the
"connection id" but only at the thread object itself.  Without that
indirection, we can't force threads to use the same connection pool as
another thread.

Fixes #23483
 2016-02-05 11:42:15 -08:00
Rafael França
f4f998d60d Merge pull request #23500 from akaspick/mailer_doc_fix 
When generating a mailer, you must specify Mailer in the class name
 2016-02-05 17:17:01 -02:00
Andrew Kaspick
8417d967e0 When generating a mailer, you must specify Mailer in the class name in 
order to generate the proper files. Some of the docs/comments are
missing this important detail.
 2016-02-05 13:59:17 -05:00
David Heinemeier Hansson
439fadf758 Missed a few spots in inline -> async switch 2016-02-05 16:05:48 +01:00
David Heinemeier Hansson
625baa69d1 Change the default adapter from inline to async 2016-02-05 15:35:37 +01:00
David Heinemeier Hansson
7fe32d28a8 Cant run on an out-of-the-box OSX installation without running out of TOO MANY FILES OPEN 2016-02-05 15:23:34 +01:00
Rafael França
fbab5c7e6a Merge pull request #23494 from prathamesh-sonpatki/update-turbolinks 
Update turbolinks-rails for passing railties test
 2016-02-05 11:47:37 -02:00
प्रथमेश Sonpatki
120c0f14b4 Merge pull request #23496 from y-yagi/donot_explicitly_mention_eventmachine_in_template 
don’t explicitly mention EventMachine [ci skip]
 2016-02-05 18:34:09 +05:30
yuuji.yaginuma
cdb6f2eb9e don’t explicitly mention EventMachine [ci skip] 
Follow up to 6accef4e11b0c793e1c085536b5ed27f32b6a0c3
 2016-02-05 21:52:59 +09:00
Prathamesh Sonpatki
2669f3753d Update turbolinks-rails for passing railties test 
Ref - https://github.com/turbolinks/turbolinks-rails/pull/3
 2016-02-05 17:02:22 +05:30
Zachary Scott
2e1a4bd761 Merge branch 'master' of github.com:rails/rails 2016-02-05 19:56:54 +09:00
Zachary Scott
be45d2f477 Check off some todos for the Testing guide with @senny [ci skip] 2016-02-05 19:56:23 +09:00
Kasper Timm Hansen
822e3c0b3e Merge pull request #23491 from y-yagi/move_changelog_entry_2 
move CHANGELOG entry to the appropriate position [ci skip]
 2016-02-05 11:56:04 +01:00
Yves Senn
f5032667f4 docs, remove trailing whitespace from testing guide. [ci skip] 2016-02-05 10:43:38 +01:00
Yves Senn
507a952686 docs, link Rails specific assertions to the API. [ci skip] 2016-02-05 10:42:22 +01:00
yuuji.yaginuma
c9768b8a88 move CHANGELOG entry to the appropriate position [ci skip] 
Dummy apple icon files has been added after the 5.0.0.beta2 release.
ref: #23455
 2016-02-05 18:27:22 +09:00
Vipul A M
3bf13b0651 Merge pull request #23489 from y-yagi/add_missing_include_to_engine_test_example 
add missing include to engine test example [ci skip]
 2016-02-05 09:57:28 +05:30
yuuji.yaginuma
924f33ad96 add missing include to engine test example [ci skip] 
Using url helper method of engine in example code,
include `Engine.routes.url_helpers` is required to use helper method of engine.
 2016-02-05 13:09:23 +09:00
Rafael França
22af61984c Merge pull request #23472 from jhubert/patch-2 
Remove the assumption of schema in DATABASE_URL
 2016-02-05 00:23:32 -02:00
Rafael França
3be9a34e78 Merge pull request #23473 from gsamokovarov/kernel-module-function 
Don't publicize Kernel core extensions
 2016-02-04 17:15:24 -02:00
Jeremy Baker
96fdbd3be3 Remove accidental additional test 2016-02-04 11:13:05 -08:00
Jeremy Baker
d871696b4a Add a resolver test for the missing scheme 2016-02-04 10:59:52 -08:00
Sean Griffin
ea59b68d75 Merge pull request #23481 from meinac/activemodel_errors_doc_for_behaviour 
Add documentation about `ActiveModel::Errors#[]` method to describe how it works [ci skip]
 2016-02-04 11:06:28 -07:00
Mehmet Emin İNAÇ
e38ced376f Add documentation about method to describe how it works [ci skip] 2016-02-04 20:03:24 +02:00
Rafael França
2e46ccbecb Merge pull request #23484 from rubys/patch-1 
hotlink to the source and results for AWDwR tests
 2016-02-04 16:00:46 -02:00
Sam Ruby
d601f4b08b hotlink to the source and results for AWDwR tests 2016-02-04 12:59:28 -05:00
Rafael Mendonça França
dd67df6136 Test with Turbolinks 5 2016-02-04 14:24:36 -02:00