aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Improve generator name suggestions a bit.ShunsukeAida2015-02-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the Levenshtein distances to most commands were wrongly calculated due to a big shortcut. This might be included in the original code for the performance sake, but I'm not sure that's something we should take over accuracy in Rails. Before 'foo' to 'assets' #=> 3 'foo' to 'controller' #=> 3 'foo' to 'generator' #=> 3 'foo' to 'helper' #=> 3 'foo' to 'integration_test' #=> 3 'foo' to 'jbuilder' #=> 3 'foo' to 'job' #=> 2 'foo' to 'mailer' #=> 3 'foo' to 'migration' #=> 3 'foo' to 'model' #=> 3 'foo' to 'resource' #=> 3 'foo' to 'resource_route' #=> 3 'foo' to 'scaffold' #=> 3 'foo' to 'scaffold_controller' #=> 3 'foo' to 'task' #=> 4 'foo' to 'active_record:migration' #=> 3 'foo' to 'active_record:model' #=> 3 'foo' to 'coffee:assets' #=> 3 'foo' to 'css:assets' #=> 3 'foo' to 'css:scaffold' #=> 3 'foo' to 'erb:controller' #=> 3 'foo' to 'erb:mailer' #=> 3 'foo' to 'erb:scaffold' #=> 3 'foo' to 'js:assets' #=> 3 'foo' to 'scss:assets' #=> 3 'foo' to 'scss:scaffold' #=> 3 'foo' to 'test_unit:controller' #=> 3 'foo' to 'test_unit:generator' #=> 3 'foo' to 'test_unit:helper' #=> 3 'foo' to 'test_unit:integration' #=> 3 'foo' to 'test_unit:job' #=> 3 'foo' to 'test_unit:mailer' #=> 3 'foo' to 'test_unit:model' #=> 3 'foo' to 'test_unit:plugin' #=> 3 'foo' to 'test_unit:scaffold' #=> 3 After 'foo' to 'assets' #=> 6 'foo' to 'controller' #=> 8 'foo' to 'generator' #=> 8 'foo' to 'helper' #=> 6 'foo' to 'integration_test' #=> 15 'foo' to 'jbuilder' #=> 8 'foo' to 'job' #=> 2 'foo' to 'mailer' #=> 6 'foo' to 'migration' #=> 8 'foo' to 'model' #=> 4 'foo' to 'resource' #=> 7 'foo' to 'resource_route' #=> 12 'foo' to 'scaffold' #=> 6 'foo' to 'scaffold_controller' #=> 16 'foo' to 'task' #=> 4 'foo' to 'active_record:migration' #=> 21 'foo' to 'active_record:model' #=> 17 'foo' to 'coffee:assets' #=> 12 'foo' to 'css:assets' #=> 10 'foo' to 'css:scaffold' #=> 10 'foo' to 'erb:controller' #=> 12 'foo' to 'erb:mailer' #=> 10 'foo' to 'erb:scaffold' #=> 10 'foo' to 'js:assets' #=> 9 'foo' to 'scss:assets' #=> 11 'foo' to 'scss:scaffold' #=> 11 'foo' to 'test_unit:controller' #=> 18 'foo' to 'test_unit:generator' #=> 18 'foo' to 'test_unit:helper' #=> 16 'foo' to 'test_unit:integration' #=> 20 'foo' to 'test_unit:job' #=> 12 'foo' to 'test_unit:mailer' #=> 16 'foo' to 'test_unit:model' #=> 14 'foo' to 'test_unit:plugin' #=> 16 'foo' to 'test_unit:scaffold' #=> 16 Besides that, the conjunction "or" of the message now appears only between the last two suggestions.
* Merge pull request #18378 from ↵Carlos Antonio da Silva2015-01-072-2/+2
|\ | | | | | | | | shunsukeaida/avoid_orm_being_humanized_in_generator_help_message Overwrite descriptions generated by Generators::Base to respect acronym.
| * acronyms like ORM should be in uppercase, so overwrite the desc generated by ↵shunsukeaida2015-01-072-2/+2
| | | | | | | | hook_for
* | Move changelog entry to the top [ci skip]Carlos Antonio da Silva2015-01-071-7/+5
| |
* | Merge pull request #18074 from caike/masterRafael Mendonça França2015-01-069-38/+58
|\ \ | | | | | | Add _mailer suffix to generated file names.
| * | Add mailer suffix to generated files and classesCarlos Souza2015-01-069-38/+58
| | | | | | | | | | | | | | | Following the same naming convention used in controllers and jobs.
* | | Use Ruby's #include? to avoid relying on AS extensionCarlos Antonio da Silva2015-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The build has failed when running the date/time ext tests in isolation due to the missing extension, so better than adding a require is using just Ruby in this case. https://travis-ci.org/rails/rails/jobs/46107954#L1077
* | | Merge pull request #18368 from kuldeepaggarwal/fix-attribute-scopeCarlos Antonio da Silva2015-01-061-3/+1
|\ \ \ | | | | | | | | fix `attribute` method scoping(i.e. private)
| * | | fix `attribute` method scoping(i.e. private)Kuldeep Aggarwal2015-01-061-3/+1
| | | | | | | | | | | | | | | | ref #52f641264b1325a4c2bdce7971b14524bd4905f1
* | | | Merge pull request #18370 from LindseyB/patch-1Guillermo Iguaran2015-01-061-1/+1
|\ \ \ \ | | | | | | | | | | Changing sets -> set [ci-skip]
| * | | | Changing sets -> set Lindsey Bieda2015-01-061-1/+1
|/ / / / | | | | | | | | Updating some minor grammar issue.
* | | | Merge pull request #18335 from georgeclaghorn/day-gymnasticsDavid Heinemeier Hansson2015-01-063-17/+151
|\ \ \ \ | |/ / / |/| | | Add #weekend?, #next_weekday, and #prev_weekday methods to Date, Time, and DateTime
| * | | Add #prev_day and #next_day as counterparts to #yesterday and #tomorrow for ↵George Claghorn2015-01-063-6/+31
| | | | | | | | | | | | | | | | Date, Time, and DateTime
| * | | Add same_time option to #prev_week and #next_week for Date, Time, and DateTimeGeorge Claghorn2015-01-063-17/+42
| | | |
| * | | Add #on_weekend?, #next_weekday, and #prev_weekday methods to Date, Time, ↵George Claghorn2015-01-063-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and DateTime `#on_weekend?` returns true if the receiving date/time falls on a Saturday or Sunday. `#next_weekday` returns a new date/time representing the next day that does not fall on a Saturday or Sunday. `#prev_weekday` returns a new date/time representing the previous day that does not fall on a Saturday or Sunday.
* | | | Merge pull request #18366 from codeodor/patch-1Rafael Mendonça França2015-01-061-1/+1
|\ \ \ \ | |_|/ / |/| | | Add log_level options to configuration guide
| * | | Add log_level options to configuration guideSammy Larbi2015-01-061-1/+1
|/ / /
* | | Merge pull request #18362 from georgemillo/attributeRafael Mendonça França2015-01-061-3/+2
|\ \ \ | | | | | | | | replacing 'attribute' method with an alias
| * | | replacing 'attribute' method with an aliasGeorge Millo2015-01-061-3/+2
| |/ /
* | | Merge pull request #18364 from prathamesh-sonpatki/ar-changelog-typosAbdelkader Boudih2015-01-061-5/+5
|\ \ \ | | | | | | | | Fixed typos and wording in ActiveRecord CHANGELOG [ci skip]
| * | | Fixed typos and wording in ActiveRecord CHANGELOG [ci skip]Prathamesh Sonpatki2015-01-061-5/+5
|/ / /
* | | Merge pull request #18358 from ↵Yves Senn2015-01-064-1/+12
|\ \ \ | |/ / |/| | | | | | | | | | | prathamesh-sonpatki/add-test-for-non-string-labeled-fixtures Fix lookup of fixtures with non-string(like Fixnum) label
| * | Fix lookup of fixtures with non-string labelPrathamesh Sonpatki2015-01-064-1/+13
|/ / | | | | | | | | | | | | | | | | | | | | - Fixtures with non-string labels such as integers should be accessed using integer label as key. For eg. pirates(1) or pirates(42). - But this results in NotFound error because the label is converted into string before looking up into the fixtures hash. - After this commit, the label is converted into string only if its a symbol. - This issue was fount out while adding a test case for https://github.com/rails/rails/commit/7b910917.
* | Merge pull request #18354 from simi/improve-request-forgery-documentationDavid Heinemeier Hansson2015-01-051-3/+3
|\ \ | | | | | | Improve protect_from_forgery documentation.
| * | Improve protect_from_forgery documentation. [ci skip].Josef Šimánek2015-01-061-3/+3
| | |
* | | Merge pull request #18356 from georgemillo/singularizeRafael Mendonça França2015-01-051-2/+2
|\ \ \ | | | | | | | | removing unecessary default parameter in private method
| * | | removing unecessary parameter in private methodGeorge Millo2015-01-061-2/+2
| | | | | | | | | | | | | | | | '_singularize' only ever gets called with one argument
* | | | Merge pull request #18355 from georgemillo/docsSean Griffin2015-01-051-0/+3
|\ \ \ \ | | | | | | | | | | Documenting 'remove_possible_method' and 'redefine_method' [ci skip]
| * | | | adding documentation for 'remove_possible_method' and 'redefine_method' [ci ↵George Millo2015-01-051-0/+3
| |/ / / | | | | | | | | | | | | skip]
* | | | Merge pull request #18350 from brainopia/fix_build_from_bind_valuesSean Griffin2015-01-052-2/+12
|\ \ \ \ | |_|/ / |/| | | Propagate bind_values from join in subquery
| * | | Correctly fetch bind_values from join in subquerybrainopia2015-01-062-2/+12
| | | |
* | | | Define attribute methods before attempting to populate recordsSean Griffin2015-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `initialize_internals_callback` will attempt to assign attributes from the current scope, which will fail if something defined the method and calls super (meaning it won't hit `method_missing`). Fixes #18339
* | | | Whitespace fixes from #18349Sean Griffin2015-01-051-2/+1
| | | |
* | | | Merge pull request #18349 from jdelStrother/primarykeylessSean Griffin2015-01-052-1/+23
|\ \ \ \ | |/ / / |/| | | Fix rollback of primarykey-less tables
| * | | Fix rollback of primarykey-less tablesJonathan del Strother2015-01-052-1/+23
| | | | | | | | | | | | If you have a table without a primary key, and an `after_commit` callback on that table (ie `has_transactional_callbacks?` returns true), then trying to rollback a transaction involving that record would result in “ActiveModel::MissingAttributeError: can't write unknown attribute ``”
* | | | Avoid changing the global state on the testsRafael Mendonça França2015-01-051-1/+6
| | | |
* | | | Merge pull request #17676 from ↵Rafael Mendonça França2015-01-052-6/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | tigrish/fix_custom_i18n_exception_handler_regression Fix I18n regression introduced by #13832
| * | | | Fix I18n regression introduced by #13832Christopher Dell2014-11-192-6/+27
| | | | | | | | | | | | | | | | | | | | Previously, when the `:raise` options was set to `false`, it would get overwritten to `true`, preventing custom exception handlers to be used.
* | | | | Merge pull request #17720 from rzane/firebird-test-supportRafael Mendonça França2015-01-055-21/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Add Firebird support to test suite
| * | | | | Add firebird support to test suiteRay Zane2015-01-055-21/+28
|/ / / / /
* | | | | Merge pull request #18344 from jonatack/patch-1Rafael Mendonça França2015-01-051-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Clean up secure_token_test
| * | | | | Clean up secure_token_testJon Atack2015-01-051-5/+5
| | | | | |
* | | | | | Merge pull request #18345 from mtthgn/patch-1Rafael Mendonça França2015-01-051-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix TypeError in Fixture creation
| * | | | | Fix TypeError in Fixture creationMatt Hogan2015-01-051-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 4.2 started doing `value.gsub('$LABEL', label)` for fixture label interpolation, but you can have have valid YAML where `label` isn't a String. For example: ```YAML 0: name: John email: johndoe@gmail.com 1: name: Jane email: janedoe@gmail.com ``` This YAML will create a label that is a Fixnum, causing `TypeError: no implicit conversion of Fixnum into String.`
* | | | | reflects changes in 34cd7e2 in the index [ci skip]Xavier Noria2015-01-051-3/+3
| | | | |
* | | | | Merge pull request #18341 from aditya-kapoor/remove-unneeded-checksRafael Mendonça França2015-01-051-2/+1
|\ \ \ \ \ | | | | | | | | | | | | remove unneeded check since /_one_time_conditions/ is not present anymore.
| * | | | | remove unneeded check since /_one_time_conditions/ is removedAditya Kapoor2015-01-051-2/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #18342 from ↵Rafael Mendonça França2015-01-051-2/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | brainopia/reset_template_assertion_without_warnings Reset template assertions without warnings
| * | | | Reset template assertions without warningsbrainopia2015-01-051-2/+4
|/ / / /
* | | | Fix typo in changelog [ci skip]Carlos Antonio da Silva2015-01-051-1/+1
| | | |