aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added 'config.' to deprecation warningAlexander Kalinichev2016-03-261-2/+2
* Merge pull request #23442 from prathamesh-sonpatki/improve-pg-version-old-err...Rafael França2016-02-032-1/+4
|\
| * Mention PostgreSQL version support in release notes [ci skip]Prathamesh Sonpatki2016-02-031-0/+3
| * Mention supported PG version in the error message.Prathamesh Sonpatki2016-02-031-1/+1
* | Merge pull request #23453 from mperham/remove_jsonRafael França2016-02-033-4/+0
|\ \
| * | Remove json gem dependencyMike Perham2016-02-033-4/+0
|/ /
* | Merge pull request #23443 from prathamesh-sonpatki/fix-logging-in-developmentMatthew Draper2016-02-041-0/+2
|\ \
| * | Put some space for non-assets requests in development modePrathamesh Sonpatki2016-02-031-0/+2
| |/
* | Merge pull request #23447 from y-yagi/update_pg_supported_version_in_docsYves Senn2016-02-034-4/+4
|\ \
| * | update supported version of PostgreSQL in docs [ci skip]yuuji.yaginuma2016-02-034-4/+4
* | | Typos in AR testsAkira Matsuda2016-02-036-10/+10
* | | Merge pull request #23436 from y-yagi/use_bin_command_in_routes_taskKasper Timm Hansen2016-02-033-17/+17
|\ \ \
| * | | use rails command in routes taskyuuji.yaginuma2016-02-033-17/+17
| |/ /
* | | Merge pull request #20997 from himesh-r/issue-20995Arthur Neves2016-02-022-2/+5
|\ \ \ | |_|/ |/| |
| * | Changed id-writer to save join table records based on association primary key...Himesh2016-02-022-2/+5
* | | Sleep well, sweet princeSean Griffin2016-02-021-1/+1
* | | Merge pull request #23437 from ryohashimoto/160203_guide_rails_secretJon Moss2016-02-022-2/+2
|\ \ \ | |_|/ |/| |
| * | use rails secret in rails guidesRyo Hashimoto2016-02-032-2/+2
|/ /
* | Merge pull request #23434 from remomueller/bump-minimum-pg-versionRafael França2016-02-022-3/+8
|\ \
| * | The minimum supported version of PostgreSQL is now >= 9.1Remo Mueller2016-02-022-3/+8
|/ /
* | Merge pull request #23433 from BillyZac/masterArthur Nogueira Neves2016-02-021-2/+2
|\ \
| * | Fix typo.Zachary Smith2016-02-021-2/+2
* | | Merge pull request #23429 from qrush/actioncable-doc-updateEileen M. Uchitelle2016-02-024-40/+53
|\ \ \ | |/ / |/| |
| * | [ci skip] Several ActionCable documentation updates:Nick Quaranto2016-02-024-40/+53
|/ /
* | Ensure tz aware attributes continue to work with arraysSean Griffin2016-02-021-1/+1
* | Avoid infinite recursion when bad values are passed to tz aware fieldsSean Griffin2016-02-022-2/+19
* | Merge pull request #23423 from yui-knk/remove_unnecessary_overrideSean Griffin2016-02-021-12/+0
|\ \
| * | Remove unnecessary overriding of `#initialize`yui-knk2016-02-021-12/+0
* | | Merge pull request #23426 from RyanNielson/patch-1Kasper Timm Hansen2016-02-021-1/+1
|\ \ \ | |/ / |/| |
| * | Change command_task.rb to commands_task.rb in docsRyan Nielson2016-02-021-1/+1
|/ /
* | Merge pull request #23331 from amatsuda/valid_scope_nameRafael França2016-02-022-0/+29
|\ \
| * | Suppress :warning:sAkira Matsuda2016-01-281-1/+1
| * | scope needs the second argumentAkira Matsuda2016-01-281-1/+1
| * | Revert "Remove valid_scope_name? check - use ruby"Akira Matsuda2016-01-282-0/+29
* | | Merge pull request #23420 from y-yagi/move_api_test_to_appropriate_fileRafael França2016-02-022-11/+10
|\ \ \
| * | | move `test_generator_if_skip_action_cable_is_given_for_an_api_app` to the app...yuuji.yaginuma2016-02-022-11/+10
* | | | Merge pull request #23396 from pschambacher/pschambacher/fix_assert_generatesRafael França2016-02-021-0/+1
|\ \ \ \
| * | | | Duplicate assert_generates options before modifying itPierre Schambacher2016-02-011-0/+1
* | | | | Merge pull request #23414 from maclover7/23411Rafael França2016-02-023-3/+16
|\ \ \ \ \
| * | | | | Fix regression in `Hash#dig` for HashWithIndifferentAccess.Jon Moss2016-02-013-3/+16
|/ / / / /
* | / / / Generated engines should protect from forgeryAaron Patterson2016-02-012-3/+4
| |/ / / |/| | |
* | | | :warning: assigned but unused variable - errAkira Matsuda2016-02-021-2/+2
* | | | Merge pull request #23408 from kangkyu/patch-1Claudio B2016-02-011-2/+2
|\ \ \ \
| * | | | Update CHANGELOG.mdKang-Kyu Lee2016-02-011-2/+2
|/ / / /
* | | | Add some Action Cable CHANGELOG entriesRafael Mendonça França2016-02-016-16/+11
* | | | Preparing for Rails 5.0.0.beta2Sean Griffin2016-02-0122-46/+96
* | | | Merge pull request #23407 from jeremy/corrupt-before-commitJeremy Daer2016-02-012-2/+33
|\ \ \ \
| * | | | Fix corrupt transaction state caused by `before_commit` exceptionsJeremy Daer2016-02-012-2/+33
* | | | | Add spaces in the braces.Kasper Timm Hansen2016-02-011-1/+1
* | | | | Converge on filter.Kasper Timm Hansen2016-02-011-5/+4