aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Change datetime to datetime-local helper tagHerminio Torres2016-06-216-139/+39
* Merge pull request #25464 from prathamesh-sonpatki/fix-http-requestRafael França2016-06-211-1/+1
|\
| * update_url is not `get` most of the times [ci skip]Prathamesh Sonpatki2016-06-221-1/+1
|/
* Revert "Merge pull request #17973 from maurogeorge/file_field_hidden_field"eileencodes2016-06-213-53/+5
* Change the raw template handler to render html-safe stringseileencodes2016-06-213-1/+19
* Merge pull request #25458 from taboularasa/taboularasa/update-docs-ActiveReco...Jon Moss2016-06-211-0/+17
|\
| * [ci skip] better docs for ActiveRecord::AttributeSet::YAMLEncoder#decodeDavid Elliott2016-06-211-0/+17
* | Merge pull request #25415 from maclover7/jm-fix-25410Rafael França2016-06-211-0/+6
|\ \ | |/ |/|
| * Add test to better demonstrate `ActiveModel::Errors#added?` behaviorJon Moss2016-06-211-0/+6
* | Merge pull request #25450 from prathamesh-sonpatki/fix-testing-guideKasper Timm Hansen2016-06-211-7/+11
|\ \
| * | Fix the docs for supported keyword args for Rails 5 style integration control...Prathamesh Sonpatki2016-06-211-7/+11
* | | Merge pull request #25452 from taboularasa/taboularasa/update-docs-api_docume...Kasper Timm Hansen2016-06-201-1/+1
|\ \ \
| * | | [ci skip] correction in command for generating api documentationDavid Elliott2016-06-201-1/+1
|/ / /
* | | Merge pull request #25430 from nfm/fix-rails-info-routes-for-apps-with-globbi...Richard Schneeman2016-06-203-1/+27
|\ \ \
| * | | Fix rails/info routes for apps with globbing routeNicholas Firth-McCoy2016-06-203-1/+27
| |/ /
* | | Merge pull request #25449 from alexcameron89/masterप्रथमेश Sonpatki2016-06-201-1/+1
|\ \ \ | |/ / |/| |
| * | [ci skip] fix typo in ActiveRecord::ConnectionHandlingAlex Kitchens2016-06-201-1/+1
|/ /
* | Merge pull request #25433 from prathamesh-sonpatki/cleanup-app-generator-codeGuillermo Iguaran2016-06-201-2/+0
|\ \
| * | No need to have conditional based on api options in assetsPrathamesh Sonpatki2016-06-201-2/+0
* | | Merge pull request #25420 from michaeldever/mdever_actioncable_development_portsGuillermo Iguaran2016-06-201-1/+1
|\ \ \ | |/ / |/| |
| * | Allow actioncable connections from any port in developmentMichael Dever2016-06-161-1/+1
* | | Merge pull request #25436 from prathamesh-sonpatki/fix-testsRichard Schneeman2016-06-192-3/+3
|\ \ \
| * | | Fix failing railties testsPrathamesh Sonpatki2016-06-182-3/+3
|/ / /
* | | Merge pull request #25426 from Shopify/fix-activejob-loggerRafael França2016-06-173-2/+16
|\ \ \
| * | | Fix jobs overriding AJ::Base#loggerJean Boussier2016-06-173-2/+16
* | | | Merge pull request #23301 from ppworks/improve_mysqldumpArthur Nogueira Neves2016-06-172-4/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Skip comments when exec mysqldumpNaoto Koshikawa2016-01-282-4/+5
* | | | Merge pull request #25302 from schneems/schneems/evented-file-boot-at-check-t...Sean Griffin2016-06-172-6/+87
|\ \ \ \
| * | | | Lock the whole boot step, get rid of unneeded hashschneems2016-06-131-5/+9
| * | | | Test how evented file checker handles forksschneems2016-06-081-1/+42
| * | | | Listen earlier in EventedFileUpdateCheckerschneems2016-06-061-6/+8
| * | | | [ci skip] document EventedFileUpdateCheckerschneems2016-06-061-0/+28
| * | | | EventedFileUpdateChecker boots once per processschneems2016-06-062-6/+12
* | | | | Merge pull request #25421 from maclover7/jm-mv-filesSean Griffin2016-06-172-0/+0
|\ \ \ \ \
| * | | | | Move code style configuration files to root directoryJon Moss2016-06-162-0/+0
|/ / / / /
* | | | | Merge pull request #24773 from ralinc/fix-silent-fail-on-psql-commandArthur Nogueira Neves2016-06-163-3/+18
|\ \ \ \ \
| * | | | | PostgreSQL: Fix db:structure:load silent failure on SQL errorRalin Chimev2016-05-103-3/+18
* | | | | | Move quiet option to development.rbRafael Mendonça França2016-06-162-3/+3
| |_|_|/ / |/| | | |
* | | | | Merge pull request #25411 from javan/fix-digesting-different-formatsMatthew Draper2016-06-175-6/+49
|\ \ \ \ \
| * | | | | Add test for nested html dependencies with same logical name as templates for...Javan Makhmali2016-06-151-2/+6
| * | | | | Move and rename testJavan Makhmali2016-06-151-7/+7
| * | | | | Fix finding templates for digesting for */* requests that render a non-defaul...Javan Makhmali2016-06-154-3/+30
| * | | | | Explicity find with the rendered format to handle searching multiple view pat...Javan Makhmali2016-06-153-4/+2
| * | | | | Fix digesting templates with identical logical names when requesting a format...Javan Makhmali2016-06-153-4/+18
| | |_|_|/ | |/| | |
* | | | | Merge pull request #25416 from alexcameron89/masterRafael França2016-06-161-2/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ci skip] Remove duplicate alias documentation in ActiveModel::ValidationsAlex Kitchens2016-06-161-2/+0
|/ / / /
* | | | Merge pull request #25271 from kamipo/prevent_range_error_for_existsSean Griffin2016-06-153-10/+6
|\ \ \ \
| * | | | Prevent `RangeError` for `FinderMethods#exists?`Ryuta Kamizono2016-06-163-6/+5
| * | | | Avoid type casting in uniqueness validatorRyuta Kamizono2016-06-041-5/+2
* | | | | Merge pull request #25407 from pjscopeland/doc/correct-pg-exampleRafael França2016-06-151-2/+2
|\ \ \ \ \