aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* adds kindlerb to the :doc bundle group for guides generationXavier Noria2012-12-221-0/+1
|
* Ignore /bin on new appsJosé Valim2012-12-221-3/+4
|
* Forgot to check in railties fixture for binstubsYehuda Katz2012-12-221-0/+0
|
* Add --no-html to scaffold generatorYehuda Katz2012-12-225-8/+54
|
* Detect rbenv and update the shebangYehuda Katz2012-12-222-1/+18
|
* Install binstubs by defaultYehuda Katz2012-12-222-4/+4
|
* Merge pull request #8085 from acapilleri/format_never_nilGuillermo Iguaran2012-12-224-3/+28
|\ | | | | if format is unknown NullMimeTypeObject is returned
| * return Mime::NullType if format is unknownAngelo Capilleri2012-12-224-3/+28
| | | | | | | | | | | | | | | | | | | | If a request has an unknown format, the methods html?, xml?, json? ...etc not raise an Exception. This patch add a class Mime::NullType, that is returned when request.format is unknown and it responds false to the methods that ends with '?' and true to 'nil?'. It refers to #7837, this issue is considered a improvement not a bug.
* | Merge pull request #8586 from balexand/cache_digests_regexRafael Mendonça França2012-12-213-2/+12
|\ \ | |/ |/| Digestor explicit dependency should not contain trailing whitespace
| * Digestor explicit dependency should not contain trailing whitespaceBrian Alexander2012-12-213-2/+12
| | | | | | | | test for rails/rails#8586
* | Move background jobs to the 'jobs' branch until fully baked. Not shipping ↵Jeremy Kemper2012-12-2125-724/+4
| | | | | | | | with Rails 4.0.
* | Merge pull request #8471 from kytrinyx/refactor-xml-to-hashSteve Klabnik2012-12-212-51/+101
|\ \ | | | | | | WIP Refactor xml conversion to hash
| * | Refactor Hash.from_xml.Steve Klabnik + Katrina Owen2012-12-212-51/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three basic refactors in this PR: * We extracted the logic into a method object. We now don't define a tone of extraneous methods on Hash, even if they were private. * Extracted blocks of the case statement into methods that do the work. This makes the logic more clear. * Extracted complicated if clauses into their own query methods. They often have two or three terms, this makes it much easier to see what they _do_. We took care not to refactor too much as to not break anything, and put comments where we suspect tests are missing. We think ActiveSupport::XMLMini might be a good candidate to move to a plugin in the future.
* | | 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 (e.g., in Pow)
| * | | Correctly shows RAILS_ENV=development even when ENV['RAILS_ENV'] is not set ↵Andy Lindeman2012-12-212-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | (e.g., in Pow) * Fixes #8025
| * | | Revert "Make sure that RAILS_ENV is set when accessing Rails.env"Andy Lindeman2012-12-212-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b3125c89f42968bec6ee0b92ab93e36dbc36d5c3. * It is not desirable to set `ENV['RAILS_ENV']`; otherwise, it will leak through to rake tasks such as `rake test` or `rake spec`. See #7175 for more details.
* | | | Merge pull request #7312 from krainboltgreene/http-token-parser-bugSteve Klabnik2012-12-212-17/+56
|\ \ \ \ | |/ / / |/| | | Http token parser bug
| * | | Refactoring the token_and_options method to fix bugsKurtis Rainbolt-Greene2012-12-152-17/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a test for the equal trun bug Adding a test for the after equal trunc bug Adding a test for the slash bug Adding a test for the slash quote bug Adding a helper method for creating a sample request object with token Writing a method to create params array from raw params Writing a method to rewrite param values in the params Writing a method to get the token params from an authorization value Refactoring the token_and_options method to fix bugs Removing unnessecary test A constant for this shared regex seemed appropriate Wanting to split up this logic Adding small documentation pieces
* | | | 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
|\ \ \ \ | | | | | | | | | | Reversible commands
| * | | | 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
| | | | | | | | | | | | | | | | | | | | [#8267]
| * | | | 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 ↵Marc-Andre Lafortune2012-12-216-19/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reversible. [#8267]
| * | | | 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
| * | | | Updated security guide to reference secret_key_base instead of secret_token, ↵Gary S. Weaver2012-12-211-3/+3
|/ / / / | | | | | | | | | | | | with a little information about the change from CookieStore to EncryptedCookieStore.
* | | | Merge pull request #7376 from ↵Rafael Mendonça França2012-12-214-15/+100
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dmitriy-kiriyenko/fix-double-callback-in-same-statement Prevent callback from being set twice. Conflicts: activesupport/CHANGELOG.md
| * | | | Prevent callback from being set twice.Dmitriy Kiriyenko2012-12-204-15/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you add one callack in two separate `set_callback` calls - it is only called once. When you do it in one `set_callback` call - it is called twice. This violates the principle of least astonishment for me. Duplicating callback is usually an error. There is a correct and obvious way to do anything without this "feature". If you want to do before_save :clear_balance, :calculate_tax, :clear_balance or whatever, you should better do before_save :carefully_calculate_tax def carefully_calculate_tax clear_balance calculate_tax clear_balance end And this even opens gates for some advanced refactorings, unlike the first approach. My assumptions are: - Principle of least astonishment is violated, when callbacks are either prevented from duplication, or not. - Duplicating callbacks is usually an error. When it is intentional - it's a smell of a bad design and can be approached without abusing this "feature". My suggestion is: do not allow duplicating callbacks in one callback call, like it is not allowed in separate callbacks call.
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to define a new method in ActiveMode::Errors for each validatior. See https://github.com/rails/rails/commit/d72a07f1d1478db9daed847eadb35bfd840674f6#commitcomment-2325333
* | | | | Merge pull request #8581 from garysweaver/security_guide_updateGuillermo Iguaran2012-12-211-7/+11
|\ \ \ \ \ | | | | | | | | | | | | Update security guide
| * | | | | Updated security guide with information about secret_token.rb and to suggest ↵Gary S. Weaver2012-12-211-7/+11
| | |/ / / | |/| | | | | | | | | | | | | securing sensitive files like database.yml and secret_token.rb
* | | | | 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
|/ / / / | | | | | | | | | | | | | | | | | | | | For some reason postgresql doesn't pass an integer value to load. cc @tenderlove
* | | | Revert "Make sure that ActiveSupport::Logger includes the Logger extensions ↵David Heinemeier Hansson2012-12-214-21/+30
| | | | | | | | | | | | | | | | | | | | | | | | from core_ext/logger" (some confusion over deprecation) This reverts commit d00f568a83a5159ed93618b1081bd17858536d1c.
* | | | Make sure that ActiveSupport::Logger includes the Logger extensions from ↵David Heinemeier Hansson2012-12-214-30/+21
| | | | | | | | | | | | | | | | core_ext/logger