aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* update doc for prefer require_relative over require + File.expand_path [ci skip]Gaurav Sharma2016-07-072-5/+5
* Merge pull request #25720 from timrogers/actiondispatch-ssl-defaults-docsप्रथमेश Sonpatki2016-07-061-4/+5
|\
| * [ci skip] Correct defaults in documentation for ActionDispatch::SSLTim Rogers2016-07-061-4/+5
|/
* Merge pull request #25717 from alexcameron89/connection_pool_docप्रथमेश Sonpatki2016-07-061-21/+21
|\
| * [ci skip] Update ConnectionPool documentation for readabilityAlex Kitchens2016-07-061-21/+21
* | Merge pull request #25716 from willnet/remove-rails-4प्रथमेश Sonpatki2016-07-061-1/+1
|\ \ | |/ |/|
| * [ci skip] Remove reference to Rails 4 in the initialization guide.willnet2016-07-061-1/+1
|/
* Merge pull request #25708 from maclover7/jm-master-bugreportsSantiago Pastorino2016-07-063-3/+3
|\
| * Bump version for master bug report templatesJon Moss2016-07-053-3/+3
* | Merge pull request #25710 from y-yagi/follow_up_to_24436प्रथमेश Sonpatki2016-07-064-5/+5
|\ \ | |/ |/|
| * remove `-t` option from default sendmail arguments [ci skip]yuuji.yaginuma2016-07-064-5/+5
|/
* Merge pull request #24890 from vipulnsward/travel-to-raiseKasper Timm Hansen2016-07-054-14/+116
|\
| * `travel/travel_to` travel time helpers, now raise on nested calls,Vipul A M2016-07-024-14/+116
* | Merge pull request #25704 from fledman/add_respond_to_missing_to_rails_applic...Rafael França2016-07-052-0/+11
|\ \
| * | implement respond_to_missing? to match method_missingDavid Feldman2016-07-052-0/+11
* | | Merge pull request #25668 from kamipo/use_squish_rather_than_strip_heredocRafael França2016-07-052-4/+4
|\ \ \
| * | | Use `squish` rather than `strip_heredoc`Ryuta Kamizono2016-07-042-4/+4
* | | | Merge pull request #25692 from johnmeehan/allow-registering-directory-for-rak...Rafael França2016-07-052-0/+18
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix test to try `spec/` directory as opposed to `app/spec` which I hadJohn Meehan2016-07-051-2/+2
| * | | removed extra blank lineJohn Meehan2016-07-051-1/+0
| * | | Allow rake notes to work with other directories.John Meehan2016-07-052-0/+19
* | | | Merge pull request #25693 from volmer/masterRafael França2016-07-052-0/+13
|\ \ \ \
| * | | | Deprecate usage of nil as route pathVolmer2016-07-052-0/+13
* | | | | Merge pull request #25257 from ta1kt0me/inspect_initializersRichard Schneeman2016-07-053-1/+10
|\ \ \ \ \
| * | | | | Initializer provides its context class nameta1kt0me2016-06-123-3/+10
| * | | | | Delegate public method for raitile nameta1kt0me2016-06-112-1/+3
| * | | | | Display railtie class name in `rails initializers`ta1kt0me2016-06-021-1/+1
* | | | | | Merge pull request #25698 from CodingItWrong/action-cable-title-fixJon Moss2016-07-051-1/+3
|\ \ \ \ \ \
| * | | | | | Add header demarcation to Action Cable guideJosh Justice2016-07-051-1/+3
|/ / / / / /
* | | | | | Merge pull request #25696 from bquorning/link-to-the-right-documentationप्रथमेश Sonpatki2016-07-051-1/+1
|\ \ \ \ \ \
| * | | | | | Point to the correct documentation [ci skip]Benjamin Quorning2016-07-051-1/+1
|/ / / / / /
* | | | | | Merge pull request #25687 from Paperback/masterRichard Schneeman2016-07-041-4/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Robots.txt removed disallow all instructionsSam Sweeney2016-07-051-4/+0
| | |/ / / | |/| | |
* | | | | Merge pull request #25678 from voxik/DRY-downloaderRafael França2016-07-044-65/+36
|\ \ \ \ \
| * | | | | Skip the test if test data download fails.Vít Ondruch2016-07-044-12/+16
| * | | | | DRY Downloader.Vít Ondruch2016-07-044-53/+20
* | | | | | Merge pull request #25679 from voxik/file-fixtures-test-require-pathnameSantiago Pastorino2016-07-041-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Pathname might not be always initialized.Vít Ondruch2016-07-041-0/+2
| |/ / / /
* | | | | Merge pull request #25680 from HermanHiddema/fix/unnecessary-nesting-in-handl...Rafael França2016-07-041-7/+5
|\ \ \ \ \
| * | | | | Fixed unnecessary nesting in handle_dependencyHerman Hiddema2016-07-041-7/+5
| |/ / / /
* | | | | Tiny documentation fixes [ci skip]Robin Dupret2016-07-041-4/+9
* | | | | Merge pull request #25684 from kivanio/masterप्रथमेश Sonpatki2016-07-041-7/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix respond_to? documentationKivanio Barbosa2016-07-041-7/+7
|/ / / /
* | | | Merge pull request #25663 from vipulnsward/updated-syntax-highlighterXavier Noria2016-07-0445-5235/+24
|\ \ \ \
| * | | | - Update Syntax Highlighter to version 4.Vipul A M2016-07-0345-5235/+24
| | |_|/ | |/| |
* | | | Merge pull request #24988 from mwear/action_cable_broadcast_notificationsMatthew Draper2016-07-043-6/+58
|\ \ \ \
| * | | | Add ActiveSupport::Notifications hook to Broadcaster#broadcastMatthew Wear2016-05-123-6/+58
* | | | | Merge pull request #25030 from mmmpa/pull_requestMatthew Draper2016-07-042-1/+22
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add guard to broadcast.mmmpa2016-05-262-1/+22
* | | | | Merge pull request #25241 from aguynamedben/fix-touch-error-messagesRichard Schneeman2016-07-032-2/+12
|\ \ \ \ \