aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #8604 from zoltankiss/minor_fixesGuillermo Iguaran2012-12-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | minor grammar fix
| * | | | | | minor grammar fixZoltan Kiss2012-12-241-1/+1
|/ / / / / /
* | | / / / silences "possibly useless use of :: in void context" warningsXavier Noria2012-12-241-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_xRafael Mendonça França2012-12-242-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | | chmod -x from non-script files
| * | | | chmod -x from non-script filesAkira Matsuda2012-12-242-0/+0
|/ / / /
* | | | Merge pull request #8595 from amatsuda/regex_warningRafael Mendonça França2012-12-231-1/+1
|\ \ \ \ | | | | | | | | | | "warning: ambiguous first argument; put parentheses or even spaces"
| * | | | "warning: ambiguous first argument; put parentheses or even spaces"Akira Matsuda2012-12-241-1/+1
|/ / / /
* | | | Merge pull request #8594 from amatsuda/rm_sqlite2Guillermo Iguaran2012-12-231-13/+5
|\ \ \ \ | | | | | | | | | | I don't think we're supporting SQLite 2
| * | | | we're not supporting SQLite 2Akira Matsuda2012-12-241-13/+5
| |/ / /
* | | | Explicit options should have precedence over railsrc on the `rails new`Rafael Mendonça França2012-12-242-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | command Closes #8545
* | | | Merge pull request #8593 from shime/masterRafael Mendonça França2012-12-231-2/+0
|\ \ \ \ | |/ / / |/| | | another little documentation fix
| * | | remove duplication from Rails::Application docsHrvoje Šimić2012-12-241-2/+0
|/ / /
* | | Merge pull request #8588 from marcandre/fix_reversibleCarlos Antonio da Silva2012-12-235-9/+24
|\ \ \ | | | | | | | | Fix Migration#reversible by not using `transaction`.
| * | | Fixes for PR [#8267]Marc-Andre Lafortune2012-12-225-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 generatorYehuda Katz2012-12-221-1/+3
| | | |
* | | | Fix syntax error in controller templateGuillermo Iguaran2012-12-221-4/+12
| | | |
* | | | 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
| | | | | | |