aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Generate `cable.js` file if does not exist when generating channelPrathamesh Sonpatki2016-04-123-0/+22
* Merge pull request #24495 from vipulnsward/rails-changelog-passSantiago Pastorino2016-04-111-18/+18
|\
| * - Fence some commands, options, gems, etc. with quotesVipul A M2016-04-101-18/+18
* | Merge pull request #24490 from prathamesh-sonpatki/add-config-to-deprecation-...Santiago Pastorino2016-04-111-3/+3
|\ \
| * | Add `config` to the deprecation warnings of deprecated config optionsPrathamesh Sonpatki2016-04-101-3/+3
* | | Merge pull request #24511 from lihanli/activemodel-dirty-attribute-changedJeremy Daer2016-04-111-3/+5
|\ \ \
| * | | set default parameter to nil to speed up attribute_changed?Lihan Li2016-04-111-3/+5
* | | | Merge pull request #24504 from nickmalcolm/masterVipul A M2016-04-121-1/+6
|\ \ \ \
| * | | | [ci skip] This modifies the HTTP Token authentication example's `authenticate...Nick Malcolm2016-04-121-1/+6
* | | | | Merge pull request #24492 from vipulnsward/pass-over-warningsJeremy Daer2016-04-1114-20/+19
|\ \ \ \ \
| * | | | | Pass over all Rails 5 warnings, to make sure:Vipul A M2016-04-1214-20/+19
| | |_|_|/ | |/| | |
* | | | | Merge pull request #24508 from alexmirk/masterVipul A M2016-04-121-5/+4
|\ \ \ \ \
| * | | | | Improved ActionView flows.rb documention [ci skip]Alex Mirkhaydarov2016-04-111-5/+4
|/ / / / /
* | | / / edit pass over the RDoc of Rails::Railtie [ci skip]Xavier Noria2016-04-111-36/+36
| |_|/ / |/| | |
* | | | remove explicit curlies for hash argumentXavier Noria2016-04-111-2/+2
* | | | Merge pull request #24485 from prathamesh-sonpatki/protected_database_env_mes...Richard Schneeman2016-04-111-2/+2
|\ \ \ \
| * | | | Cleanup message shown while running destructive action against protected data...Prathamesh Sonpatki2016-04-101-2/+2
* | | | | Merge pull request #24497 from vipulnsward/am-changelog-passYves Senn2016-04-111-4/+3
|\ \ \ \ \
| * | | | | Pass over AM changelogVipul A M2016-04-101-4/+3
| | |/ / / | |/| | |
* | | | | issue FileUtils commands directly in Rake tasksXavier Noria2016-04-114-15/+12
| |_|/ / |/| | |
* | | | revises fileutils dependencies in railtiesXavier Noria2016-04-118-4/+13
* | | | Merge pull request #24487 from tomkadwill/action-mailer-base-docsVipul A M2016-04-101-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update ActionMailer Views documentation [ci skip]Tom Kadwill2016-04-101-1/+1
| | |/ | |/|
* | | Merge pull request #24486 from y-yagi/do_not_create_unnecessary_directoryRafael França2016-04-102-5/+2
|\ \ \ | |_|/ |/| |
| * | do not create unnecessary directoryyuuji.yaginuma2016-04-102-5/+2
| |/
* | Merge pull request #24488 from y-yagi/fix_file_pathAbdelkader Boudih2016-04-101-4/+4
|\ \
| * | fix typo in file path [ci skip]yuuji.yaginuma2016-04-101-4/+4
| |/
* | Merge pull request #24484 from prathamesh-sonpatki/protecte_structure_load_tooRichard Schneeman2016-04-101-1/+1
|\ \ | |/ |/|
| * Check for protected environments before trying to load structure.sql filePrathamesh Sonpatki2016-04-101-1/+1
|/
* Merge pull request #23702 from namusyaka/fix-json-behaviorEileen M. Uchitelle2016-04-093-0/+15
|\
| * Fix behavior of JSON encoding for Exceptionnamusyaka2016-04-093-0/+15
|/
* Merge pull request #24165 from y-yagi/generate_application_job_when_not_existEileen M. Uchitelle2016-04-094-0/+39
|\
| * generate ApplicationJob if it does not already existyuuji.yaginuma2016-03-254-0/+39
* | Merge pull request #24475 from jeremy/ar/mariadb-supports-datetime-precisionJeremy Daer2016-04-086-24/+56
|\ \
| * | Support microsecond datetime precision on MariaDB 5.3+.Jeremy Daer2016-04-086-24/+56
|/ /
* | Merge pull request #24457 from jeremy/mailer/dont-deliver-later-after-message...Jeremy Daer2016-04-083-2/+40
|\ \
| * | Disallow calling `#deliver_later` after local message modifications.Jeremy Daer2016-04-073-2/+40
* | | Merge pull request #24474 from djunzu/fix_welcome_page_docsYves Senn2016-04-081-2/+1
|\ \ \
| * | | Remove reference to non existing link in the welcome page.djunzu2016-04-081-2/+1
|/ / /
* | | Merge pull request #24471 from swrobel/patch-1Rafael França2016-04-081-1/+2
|\ \ \
| * | | Clarify fixtures examples [ci skip]Stefan Wrobel2016-04-081-1/+2
|/ / /
* | | Merge pull request #24468 from RochesterinNYC/patch-2Rafael França2016-04-081-1/+1
|\ \ \
| * | | Clarify description of `include_all_helpers` config setting's default behavio...James Wen2016-04-081-1/+1
|/ / /
* | | Merge pull request #24467 from javiervidal/20160409Yves Senn2016-04-081-1/+1
|\ \ \
| * | | Fix broken link in 'Ruby on Rails 3.1 Release Notes' [ci skip]Javier Vidal2016-04-081-1/+1
|/ / /
* | | Use new hash syntax (#24464)Jeroen Visser2016-04-082-4/+4
* | | Merge pull request #24465 from y-yagi/remove_needless_entryVipul A M2016-04-082-9/+0
|\ \ \
| * | | remove needless entry [ci skip]yuuji.yaginuma2016-04-082-9/+0
* | | | Merge pull request #24461 from repinel/fix-etag-docsRafael França2016-04-081-1/+1
|\ \ \ \
| * | | | Fixes for the strong & weak ETags guide [ci skip]Roque Pinel2016-04-071-1/+1
|/ / / /