aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 :<
* | | | Typos in AR testsAkira Matsuda2016-02-044-5/+5
| |/ / |/| |
* | | Merge pull request #23464 from kamipo/remove_commented_out_code_in_travis_rbSean Griffin2016-02-031-14/+0
|\ \ \ | | | | | | | | Remove commented out code in `ci/travis.rb` [ci skip]
| * | | Remove commented out code in `ci/travis.rb` [ci skip]Ryuta Kamizono2016-02-041-14/+0
| | | |
* | | | Merge pull request #23460 from ↵Sean Griffin2016-02-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/innodb_supports_fulltext_and_spatial_indexes InnoDB supports FULLTEXT and Spatial Indexes [ci skip]
| * | | | InnoDB supports FULLTEXT and Spatial Indexes [ci skip]Ryuta Kamizono2016-02-041-1/+1
| |/ / / | | | | | | | | | | | | | | | | https://dev.mysql.com/doc/refman/5.7/en/innodb-fulltext-index.html https://dev.mysql.com/doc/refman/5.7/en/creating-spatial-indexes.html
* | | | Merge pull request #23458 from kamipo/activerecord_supports_mysql_5.0_and_upSean Griffin2016-02-034-14/+10
|\ \ \ \ | | | | | | | | | | Active Record supports MySQL >= 5.0
| * | | | Active Record supports MySQL >= 5.0Ryuta Kamizono2016-02-044-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Currently some features uses `information_schema` (e.g. foreign key support). `information_schema` introduced since MySQL 5.0.
* | | | | Merge pull request #23452 from phusion/action_cableJon Moss2016-02-031-2/+11
|\ \ \ \ \ | | | | | | | | | | | | Document the fact that Action Cable does not require a multi-threaded app server
| * | | | | Document the fact that Action Cable does not require a multi-threaded app serverHongli Lai (Phusion)2016-02-031-2/+11
| | |_|/ / | |/| | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #23465 from kamipo/sqlite2_support_has_been_droppedSean Griffin2016-02-033-4/+1
|\ \ \ \ \ | | | | | | | | | | | | SQLite 2 support has been dropped [ci skip]
| * | | | | SQLite 2 support has been dropped [ci skip]Ryuta Kamizono2016-02-043-4/+1
|/ / / / /
* | | | | Merge pull request #23459 from mperham/masterArthur Nogueira Neves2016-02-032-2/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused dependency
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 09:23:52 +0000