Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8607 from ↵ | Rafael Mendonça França | 2012-12-25 | 2 | -2/+20 |
|\ | | | | | | | | | senny/8576_cant_inherit_from_deprecated_buffered_logger ActiveSupport::BufferedLogger can be subclassed | ||||
| * | ActiveSupport::BufferedLogger can be subclassed | Yves Senn | 2012-12-25 | 2 | -2/+20 |
|/ | |||||
* | Merge pull request #8592 from rafaelfranca/warning_fix | Guillermo Iguaran | 2012-12-24 | 1 | -1/+5 |
|\ | | | | | Remove warning of intance variable not initialized | ||||
| * | Remove warning of intance variable not initialized | Rafael Mendonça França | 2012-12-23 | 1 | -1/+5 |
| | | |||||
* | | Merge pull request #8604 from zoltankiss/minor_fixes | Guillermo Iguaran | 2012-12-24 | 1 | -1/+1 |
|\ \ | | | | | | | minor grammar fix | ||||
| * | | minor grammar fix | Zoltan Kiss | 2012-12-24 | 1 | -1/+1 |
|/ / | |||||
* | | silences "possibly useless use of :: in void context" warnings | Xavier Noria | 2012-12-24 | 1 | -7/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | The AS utility silence_warnings does not really silence this one, because it is issued at parse-time. It seemed to in some places because the constant was the only expression in the block and therefore it was its return value, that could potentially be used by silence_warnings are return value of the yield call. To bypass the warning we assign to a variable. The chosen variable is "_" because it is special-cased in parse.c not to issue an "assigned but unused variable" warning in turn. | ||||
* | | Merge pull request #8601 from amatsuda/chmod_x | Rafael Mendonça França | 2012-12-24 | 2 | -0/+0 |
|\ \ | | | | | | | chmod -x from non-script files | ||||
| * | | chmod -x from non-script files | Akira Matsuda | 2012-12-24 | 2 | -0/+0 |
|/ / | |||||
* | | Merge pull request #8595 from amatsuda/regex_warning | Rafael Mendonça França | 2012-12-23 | 1 | -1/+1 |
|\ \ | | | | | | | "warning: ambiguous first argument; put parentheses or even spaces" | ||||
| * | | "warning: ambiguous first argument; put parentheses or even spaces" | Akira Matsuda | 2012-12-24 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #8594 from amatsuda/rm_sqlite2 | Guillermo Iguaran | 2012-12-23 | 1 | -13/+5 |
|\ \ | | | | | | | I don't think we're supporting SQLite 2 | ||||
| * | | we're not supporting SQLite 2 | Akira Matsuda | 2012-12-24 | 1 | -13/+5 |
| |/ | |||||
* | | Explicit options should have precedence over railsrc on the `rails new` | Rafael Mendonça França | 2012-12-24 | 2 | -2/+5 |
| | | | | | | | | | | | | command Closes #8545 | ||||
* | | Merge pull request #8593 from shime/master | Rafael Mendonça França | 2012-12-23 | 1 | -2/+0 |
|\ \ | |/ |/| | another little documentation fix | ||||
| * | remove duplication from Rails::Application docs | Hrvoje Šimić | 2012-12-24 | 1 | -2/+0 |
|/ | |||||
* | Merge pull request #8588 from marcandre/fix_reversible | Carlos Antonio da Silva | 2012-12-23 | 5 | -9/+24 |
|\ | | | | | Fix Migration#reversible by not using `transaction`. | ||||
| * | Fixes for PR [#8267] | Marc-Andre Lafortune | 2012-12-22 | 5 | -9/+24 |
| | | | | | | | | | | | | | | | | * Fix Migration#reversible by not using `transaction`. * Adapt mysql adapter to updated api for remove_column * Update test after aedcd683684d08eaf30623a4b48ce31a31426372 | ||||
* | | Fix spacing regression in scaffold generator | Yehuda Katz | 2012-12-22 | 1 | -1/+3 |
| | | |||||
* | | Fix syntax error in controller template | Guillermo Iguaran | 2012-12-22 | 1 | -4/+12 |
| | | |||||
* | | adds kindlerb to the :doc bundle group for guides generation | Xavier Noria | 2012-12-22 | 1 | -0/+1 |
| | | |||||
* | | Ignore /bin on new apps | José Valim | 2012-12-22 | 1 | -3/+4 |
| | | |||||
* | | Forgot to check in railties fixture for binstubs | Yehuda Katz | 2012-12-22 | 1 | -0/+0 |
| | | |||||
* | | Add --no-html to scaffold generator | Yehuda Katz | 2012-12-22 | 5 | -8/+54 |
| | | |||||
* | | Detect rbenv and update the shebang | Yehuda Katz | 2012-12-22 | 2 | -1/+18 |
| | | |||||
* | | Install binstubs by default | Yehuda Katz | 2012-12-22 | 2 | -4/+4 |
| | | |||||
* | | Merge pull request #8085 from acapilleri/format_never_nil | Guillermo Iguaran | 2012-12-22 | 4 | -3/+28 |
|\ \ | | | | | | | if format is unknown NullMimeTypeObject is returned | ||||
| * | | return Mime::NullType if format is unknown | Angelo Capilleri | 2012-12-22 | 4 | -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_regex | Rafael Mendonça França | 2012-12-21 | 3 | -2/+12 |
|\ \ | |/ |/| | Digestor explicit dependency should not contain trailing whitespace | ||||
| * | Digestor explicit dependency should not contain trailing whitespace | Brian Alexander | 2012-12-21 | 3 | -2/+12 |
| | | | | | | | | test for rails/rails#8586 | ||||
* | | Move background jobs to the 'jobs' branch until fully baked. Not shipping ↵ | Jeremy Kemper | 2012-12-21 | 25 | -724/+4 |
| | | | | | | | | with Rails 4.0. | ||||
* | | Merge pull request #8471 from kytrinyx/refactor-xml-to-hash | Steve Klabnik | 2012-12-21 | 2 | -51/+101 |
|\ \ | | | | | | | WIP Refactor xml conversion to hash | ||||
| * | | Refactor Hash.from_xml. | Steve Klabnik + Katrina Owen | 2012-12-21 | 2 | -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_env | Rafael Mendonça França | 2012-12-21 | 4 | -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 Lindeman | 2012-12-21 | 2 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | (e.g., in Pow) * Fixes #8025 | ||||
| * | | | Revert "Make sure that RAILS_ENV is set when accessing Rails.env" | Andy Lindeman | 2012-12-21 | 2 | -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-bug | Steve Klabnik | 2012-12-21 | 2 | -17/+56 |
|\ \ \ \ | |/ / / |/| | | | Http token parser bug | ||||
| * | | | Refactoring the token_and_options method to fix bugs | Kurtis Rainbolt-Greene | 2012-12-15 | 2 | -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 name | Carlos Antonio da Silva | 2012-12-21 | 2 | -4/+4 |
| | | | | |||||
* | | | | Fix calling quote column name in interpolated string | Carlos Antonio da Silva | 2012-12-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #8267 from marcandre/reversible_drop_table_etc | Aaron Patterson | 2012-12-21 | 15 | -307/+841 |
|\ \ \ \ | | | | | | | | | | | Reversible commands | ||||
| * | | | | Update Migration and 4.0 Release Guides, Changelogs [#8267] | Marc-Andre Lafortune | 2012-12-21 | 4 | -36/+223 |
| | | | | | |||||
| * | | | | Make execute, change_column and remove_columns methods actually irreversible | Marc-Andre Lafortune | 2012-12-21 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | [#8267] | ||||
| * | | | | Make change_table reversible when possible [#8267] | Marc-Andre Lafortune | 2012-12-21 | 2 | -1/+25 |
| | | | | | |||||
| * | | | | Migration generators use `change` even for destructive methods [#8267] | Marc-Andre Lafortune | 2012-12-21 | 2 | -47/+16 |
| | | | | | |||||
| * | | | | Factorize methods that are easily reversible [#8267] | Marc-Andre Lafortune | 2012-12-21 | 2 | -42/+28 |
| | | | | | |||||
| * | | | | Make remove_index reversible [#8267] | Marc-Andre Lafortune | 2012-12-21 | 2 | -7/+34 |
| | | | | | |||||
| * | | | | Differentiate between remove_column and remove_columns. Make remove_column ↵ | Marc-Andre Lafortune | 2012-12-21 | 6 | -19/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reversible. [#8267] | ||||
| * | | | | Make drop_table reversible [#8267] | Marc-Andre Lafortune | 2012-12-21 | 4 | -17/+41 |
| | | | | | |||||
| * | | | | Add drop_join_table [#8267] | Marc-Andre Lafortune | 2012-12-21 | 4 | -7/+69 |
| | | | | |