aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove duplicated `require 'arel'`Ryuta Kamizono2016-02-061-1/+0
| | | | It appears first in `lib/active_record.rb`.
* Merge pull request #23513 from kamipo/revert-23502-update-travis-masterKasper Timm Hansen2016-02-061-2/+2
|\ | | | | Revert "No need to specify Ruby patch version on Travis CI"
| * Revert "No need to specify Ruby patch version on Travis CI"Ryuta Kamizono2016-02-061-2/+2
| |
* | Merge pull request #23514 from y-yagi/revert_mailer_doc_fixKasper Timm Hansen2016-02-062-2/+2
|\ \ | | | | | | Revert "When generating a mailer, you must specify Mailer in the class name in"
| * | Revert "When generating a mailer, you must specify Mailer in the class name in"yuuji.yaginuma2016-02-062-2/+2
|/ / | | | | | | | | | | | | | | 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]
* | add missing requireAaron Patterson2016-02-051-0/+1
| |
* | Fix mixing line filters with Minitest's -n filter.Kasper Timm Hansen2016-02-052-4/+36
|/ | | | | | | | | | | 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.
* Revert "Dump indexes in `create_table` instead of `add_index`"Sean Griffin2016-02-053-21/+16
| | | | | | | | | | 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.
* Merge pull request #23502 from sikachu/update-travis-masterRafael França2016-02-051-2/+2
|\ | | | | No need to specify Ruby patch version on Travis CI
| * No need to specify Ruby patch version on Travis CIPrem Sichanugrist2016-02-051-2/+2
|/ | | | | Travis CI now select the latest patch version of Ruby automatically when given MAJOR.MINOR version string.
* disable controller / view thread spawning in testsAaron Patterson2016-02-053-3/+31
| | | | | | | | | | | | | | | | | | 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
* Merge pull request #23500 from akaspick/mailer_doc_fixRafael França2016-02-052-2/+2
|\ | | | | When generating a mailer, you must specify Mailer in the class name
| * When generating a mailer, you must specify Mailer in the class name inAndrew Kaspick2016-02-052-2/+2
|/ | | | | order to generate the proper files. Some of the docs/comments are missing this important detail.
* Missed a few spots in inline -> async switchDavid Heinemeier Hansson2016-02-053-8/+3
|
* Change the default adapter from inline to asyncDavid Heinemeier Hansson2016-02-053-7/+16
|
* Cant run on an out-of-the-box OSX installation without running out of TOO ↵David Heinemeier Hansson2016-02-051-1/+1
| | | | MANY FILES OPEN
* Merge pull request #23494 from prathamesh-sonpatki/update-turbolinksRafael França2016-02-052-4/+9
|\ | | | | Update turbolinks-rails for passing railties test
| * Update turbolinks-rails for passing railties testPrathamesh Sonpatki2016-02-052-4/+9
| | | | | | | | Ref - https://github.com/turbolinks/turbolinks-rails/pull/3
* | Merge pull request #23496 from ↵प्रथमेश Sonpatki2016-02-051-1/+1
|\ \ | |/ |/| | | | | y-yagi/donot_explicitly_mention_eventmachine_in_template don’t explicitly mention EventMachine [ci skip]
| * don’t explicitly mention EventMachine [ci skip]yuuji.yaginuma2016-02-051-1/+1
|/ | | | Follow up to 6accef4e11b0c793e1c085536b5ed27f32b6a0c3
* Merge branch 'master' of github.com:rails/railsZachary Scott2016-02-051-2/+2
|\
| * Merge pull request #23491 from y-yagi/move_changelog_entry_2Kasper Timm Hansen2016-02-051-2/+2
| |\ | | | | | | move CHANGELOG entry to the appropriate position [ci skip]
| | * move CHANGELOG entry to the appropriate position [ci skip]yuuji.yaginuma2016-02-051-2/+2
| | | | | | | | | | | | | | | Dummy apple icon files has been added after the 5.0.0.beta2 release. ref: #23455
* | | Check off some todos for the Testing guide with @senny [ci skip]Zachary Scott2016-02-051-17/+26
|/ /
* | docs, remove trailing whitespace from testing guide. [ci skip]Yves Senn2016-02-051-9/+9
| |
* | docs, link Rails specific assertions to the API. [ci skip]Yves Senn2016-02-051-6/+6
| |
* | Merge pull request #23489 from y-yagi/add_missing_include_to_engine_test_exampleVipul A M2016-02-051-0/+4
|\ \ | |/ |/| add missing include to engine test example [ci skip]
| * add missing include to engine test example [ci skip]yuuji.yaginuma2016-02-051-0/+4
| | | | | | | | | | Using url helper method of engine in example code, include `Engine.routes.url_helpers` is required to use helper method of engine.
* | Merge pull request #23472 from jhubert/patch-2Rafael França2016-02-052-1/+7
|\ \ | |/ |/| Remove the assumption of schema in DATABASE_URL
| * Remove accidental additional testJeremy Baker2016-02-041-5/+0
| |
| * Add a resolver test for the missing schemeJeremy Baker2016-02-042-0/+11
| |
| * Remove the assumption of schema in DATABASE_URLJeremy Baker2016-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you set the DATABASE_URL environment variable to `mydatabase` by accident, you end up getting a series of errors that are hard to trace. For example: ``` warning: already initialized constant ActiveRecord::Base::OrmAdapter ``` Turns out the cascade of errors is due to the error raised by `.tr` being called on `nil`. This commit makes sure that `scheme` is set before calling `.tr` on it. My previous iteration used `@uri.scheme.try(:tr, '-', '_')` but using the `&&` logical operator is a fair bit faster: http://stackoverflow.com/questions/26655032/try-vs-performance With this change, the error message becomes much more understandable: ``` FATAL: database "mydatabase" does not exist (ActiveRecord::NoDatabaseError) ```
* | Merge pull request #23473 from gsamokovarov/kernel-module-functionRafael França2016-02-042-0/+4
|\ \ | | | | | | Don't publicize Kernel core extensions
| * | Don't publicize Kernel core extensionsGenadi Samokovarov2016-02-042-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a reaction to a [bug] we hit in web-console. The cause of it was a `Kernel` extension called `#console` that was public and was fighting over Railties with console block to be run on `rails console`. We solved it by making the method private. We did that through `module_function` so `::Kernel.console` can be invoked even in `BasicObject`. I'm proposing to make most of the core Active Support `Kernel` extensions `module_function` as well. Those are currently public and we are polluting every `Object` public interface with them. ```ruby >> Object.new.respond_to? :silence_warnings => true >> Object.new.respond_to? :with_warnings => true >> Object.new.respond_to? :enable_warnings => true >> Object.new.respond_to? :suppress => true `` Some extensions like `Kernel#class_eval` should be public, but most of them don't really need to be. [bug]: https://github.com/rails/web-console/issues/184
* | | Merge pull request #23481 from meinac/activemodel_errors_doc_for_behaviourSean Griffin2016-02-041-0/+9
|\ \ \ | | | | | | | | Add documentation about `ActiveModel::Errors#[]` method to describe how it works [ci skip]
| * | | Add documentation about method to describe how it works [ci skip]Mehmet Emin İNAÇ2016-02-041-0/+9
| | | |
* | | | Merge pull request #23484 from rubys/patch-1Rafael França2016-02-041-7/+7
|\ \ \ \ | | | | | | | | | | hotlink to the source and results for AWDwR tests
| * | | | hotlink to the source and results for AWDwR testsSam Ruby2016-02-041-7/+7
|/ / / /
* | | | Test with Turbolinks 5Rafael Mendonça França2016-02-042-4/+5
| | | |
* | | | Merge pull request #23479 from vipulnsward/23431-remove-jquery-on-sprockets-skipRafael França2016-02-042-2/+3
|\ \ \ \ | | | | | | | | | | Remove jquery-rails gem from generator if --skip-sprockets is true
| * | | | - app generate option --skip-sprockets leaves jquery-rails gem, which relies ↵Vipul A M2016-02-042-2/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | on sprockets environment - Remove jquery-rails if --skip-sprockets is true Fixes #23431
* | | | Merge pull request #23480 from sikachu/redis-commented-outDavid Heinemeier Hansson2016-02-041-1/+1
|\ \ \ \ | | | | | | | | | | Update assertion on redis in generated Gemfile
| * | | | Update assertion on redis in generated GemfilePrem Sichanugrist2016-02-041-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redis now included in Gemfile but commented out. This change was made in 91864439c7aebb6ca710831aac6781903a433904 and is causing the test failure. See https://travis-ci.org/rails/rails/jobs/106994913#L1025
* | | | Merge pull request #23478 from vipulnsward/23470-pass-api-in-update-generatorRafael França2016-02-041-1/+1
|\ \ \ \ | | | | | | | | | | Pass api only option to rails rails:update task to update only based on api Apps
| * | | | Pass api only option to rails rails:update task to update only based on API.Vipul A M2016-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes #23470
* | | | | Turbolinks has moved outDavid Heinemeier Hansson2016-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | All grown up and shit!
* | | | | Redis is now only needed if you want to use Action Cable in productionDavid Heinemeier Hansson2016-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | So no need to have it on by default in the Gemfile.
* | | | | Allow for non-standard redis connectorsDavid Heinemeier Hansson2016-02-043-3/+22
| |_|_|/ |/| | |
* | | | rake stats dynamically scales nowAkira Matsuda2016-02-041-9/+21
| | | | | | | | | | | | | | | | So it can properly show stats for an app with 1,000,000+ LOC
* | | | Revert "Lines of code can be 100,000+ in a Rails app"Akira Matsuda2016-02-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 293bd95c3e77275193130bc14c986348aae8b0e2. This broke the header :<
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 12:48:26 +0000