aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move background jobs to the 'jobs' branch until fully baked. Not shipping wit...Jeremy Kemper2012-12-2125-724/+4
* Merge pull request #8471 from kytrinyx/refactor-xml-to-hashSteve Klabnik2012-12-212-51/+101
|\
| * Refactor Hash.from_xml.Steve Klabnik + Katrina Owen2012-12-212-51/+101
* | Merge pull request #8574 from alindeman/rails_envRafael Mendonça França2012-12-214-7/+14
|\ \
| * | Correctly shows RAILS_ENV=development even when ENV['RAILS_ENV'] is not set (...Andy Lindeman2012-12-212-1/+13
| * | Revert "Make sure that RAILS_ENV is set when accessing Rails.env"Andy Lindeman2012-12-212-6/+1
* | | Merge pull request #7312 from krainboltgreene/http-token-parser-bugSteve Klabnik2012-12-212-17/+56
|\ \ \ | |/ / |/| |
| * | Refactoring the token_and_options method to fix bugsKurtis Rainbolt-Greene2012-12-152-17/+56
* | | Remove duplicated methods in command recorder and duplicated test nameCarlos Antonio da Silva2012-12-212-4/+4
* | | Fix calling quote column name in interpolated stringCarlos Antonio da Silva2012-12-211-1/+1
* | | Merge pull request #8267 from marcandre/reversible_drop_table_etcAaron Patterson2012-12-2115-307/+841
|\ \ \
| * | | Update Migration and 4.0 Release Guides, Changelogs [#8267]Marc-Andre Lafortune2012-12-214-36/+223
| * | | Make execute, change_column and remove_columns methods actually irreversibleMarc-Andre Lafortune2012-12-212-2/+9
| * | | Make change_table reversible when possible [#8267]Marc-Andre Lafortune2012-12-212-1/+25
| * | | Migration generators use `change` even for destructive methods [#8267]Marc-Andre Lafortune2012-12-212-47/+16
| * | | Factorize methods that are easily reversible [#8267]Marc-Andre Lafortune2012-12-212-42/+28
| * | | Make remove_index reversible [#8267]Marc-Andre Lafortune2012-12-212-7/+34
| * | | Differentiate between remove_column and remove_columns. Make remove_column re...Marc-Andre Lafortune2012-12-216-19/+44
| * | | Make drop_table reversible [#8267]Marc-Andre Lafortune2012-12-214-17/+41
| * | | Add drop_join_table [#8267]Marc-Andre Lafortune2012-12-214-7/+69
| * | | Add Migration#reversible for reversible data operations [#8267]Marc-Andre Lafortune2012-12-213-1/+85
| * | | Allow revert of whole migration [#8267]Marc-Andre Lafortune2012-12-212-3/+102
| * | | Extract exec_migration [#8267]Marc-Andre Lafortune2012-12-211-11/+16
| * | | Allow reverting of migration commands with Migration#revert [#8267]Marc-Andre Lafortune2012-12-214-90/+155
| * | | Split ridiculously long lineMarc-Andre Lafortune2012-12-211-1/+4
| * | | Simple replacement of variable name for consistencyMarc-Andre Lafortune2012-12-211-32/+32
| * | | Simplify change_table and avoid duplicated logicMarc-Andre Lafortune2012-12-212-40/+7
* | | | Merge pull request #8584 from garysweaver/security_guide_updateGuillermo Iguaran2012-12-211-3/+3
|\ \ \ \
| * | | | Updated security guide to reference secret_key_base instead of secret_token, ...Gary S. Weaver2012-12-211-3/+3
|/ / / /
* | | | Merge pull request #7376 from dmitriy-kiriyenko/fix-double-callback-in-same-s...Rafael Mendonça França2012-12-214-15/+100
|\ \ \ \
| * | | | Prevent callback from being set twice.Dmitriy Kiriyenko2012-12-204-15/+100
* | | | | Remove CHANGELOG entry for ActiveModel::Errors#add_on_presentRafael Mendonça França2012-12-211-5/+0
* | | | | Use :present as key for the absence validatior messageRafael Mendonça França2012-12-212-2/+2
* | | | | Remove ActiveModel::Errors#add_on_present method.Rafael Mendonça França2012-12-213-16/+3
* | | | | Merge pull request #8581 from garysweaver/security_guide_updateGuillermo Iguaran2012-12-211-7/+11
|\ \ \ \ \
| * | | | | Updated security guide with information about secret_token.rb and to suggest ...Gary S. Weaver2012-12-211-7/+11
| | |/ / / | |/| | |
* | | | | BufferedLogger is deprecated too.Rafael Mendonça França2012-12-211-1/+1
* | | | | Fix broken test for postgresqlRafael Mendonça França2012-12-211-1/+1
|/ / / /
* | | | Revert "Make sure that ActiveSupport::Logger includes the Logger extensions f...David Heinemeier Hansson2012-12-214-21/+30
* | | | Make sure that ActiveSupport::Logger includes the Logger extensions from core...David Heinemeier Hansson2012-12-214-30/+21
* | | | Add ActiveSupport::Logger#silence that works the same as the old Logger#silen...David Heinemeier Hansson2012-12-215-20/+45
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-214-23/+45
|\ \ \ \
| * | | | copy edits in assets guide [ci skip]Vijay Dev2012-12-211-23/+26
| * | | | Revert "Fix incorrect adjustment 4c41e87e3ae548c44810b66437b2f0f6e73b2106"Vijay Dev2012-12-211-1/+1
| * | | | Fix incorrect adjustment 4c41e87e3ae548c44810b66437b2f0f6e73b2106kei2012-12-201-1/+1
| * | | | Fix documentation stylekei2012-12-201-1/+1
| * | | | Remove Reference to Ruby 1.8.7John Kelly2012-12-201-2/+1
| * | | | Explain controller specific assets more thoroughlyDamian Galarza2012-12-171-17/+32
| * | | | Add script_name option description and example for #url_for optionsIvan Vanyak2012-12-171-0/+5
* | | | | Serialized attribute can be serialized in an integer columnRafael Mendonça França2012-12-215-3/+47