Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #14447 from Houdini/gitignore | Rafael Mendonça França | 2014-03-24 | 5 | -2/+36 | |
|\ \ | | | | | | | | | | Skip sqlite3 files in .gitignore if no sqlite3 in app | |||||
| * | | Remove sqlite3 lines from .gitignore if the application is not using sqlite3. | Dmitrii Golub | 2014-03-24 | 5 | -2/+36 | |
| | | | ||||||
* | | | Adding active_model in Rails::Info | Ankit Gupta | 2014-03-23 | 1 | -1/+1 | |
|/ / | ||||||
* | | test for structure:dump without schema information table. refs eafec46 | Yves Senn | 2014-03-20 | 1 | -0/+12 | |
| | | | | | | | | This is a test case for the fix provided in eafec4694c5b37eff9d83b1188b8e331fa6027fa | |||||
* | | Remove some indirection in rake dbs test | Carlos Antonio da Silva | 2014-03-20 | 1 | -34/+20 | |
| | | | | | | | | | | Just pass in the expected database as argument rather than "caching" it in a hash and using the hash in the helper methods. | |||||
* | | Check if the output is empty rather than asserting for equality | Carlos Antonio da Silva | 2014-03-20 | 1 | -5/+4 | |
| | | | | | | | | Also fix indent of test block. | |||||
* | | Refactor assertion of line numbers matching 4 spaces | Carlos Antonio da Silva | 2014-03-19 | 1 | -16/+4 | |
| | | ||||||
* | | Move booting/loading tasks setup to the rake notes helper method | Carlos Antonio da Silva | 2014-03-19 | 1 | -15/+3 | |
| | | ||||||
* | | Extract rake notes command and lines scan boilerplate | Carlos Antonio da Silva | 2014-03-19 | 1 | -19/+14 | |
| | | | | | | | | Refactor to a reusable method. | |||||
* | | Remove extra space assertion | Carlos Antonio da Silva | 2014-03-19 | 1 | -3/+2 | |
| | | | | | | | | | | No need to check that each line contains an extra space, just matching the space in the regexp is enough to ensure that. | |||||
* | | Extract common setup for loading tasks in rake notes tests | Carlos Antonio da Silva | 2014-03-19 | 1 | -29/+14 | |
| | | ||||||
* | | Merge pull request #14379 from robertomiranda/rake-notes.config | Guillermo Iguaran | 2014-03-17 | 5 | -29/+74 | |
|\ \ | | | | | | | Add Public Api for Register New Extensions for Rake Notes | |||||
| * | | Rake notes should picked up new Extensions registered in the ↵ | robertomiranda | 2014-03-17 | 1 | -3/+19 | |
| | | | | | | | | | | | | config/application.rb file | |||||
| * | | Add Changelog Entry ref #14379 | robertomiranda | 2014-03-17 | 1 | -0/+8 | |
| | | | ||||||
| * | | Add config.annotations, in order to register new extensions for Rake notes ↵ | robertomiranda | 2014-03-16 | 2 | -0/+14 | |
| | | | | | | | | | | | | at config level | |||||
| * | | Fix Shadowing extensions variable in Register Annotation Exentsions | robertomiranda | 2014-03-16 | 2 | -7/+7 | |
| | | | ||||||
| * | | Supporting .ruby, .yml and .yaml Extension in Rake Notes | robertomiranda | 2014-03-14 | 2 | -2/+7 | |
| | | | ||||||
| * | | Remove .scss, .sass, .less, .haml, .slim, coffee from Rake Notes. Now we ↵ | robertomiranda | 2014-03-14 | 2 | -17/+5 | |
| | | | | | | | | | | | | have an API for register it in the corresponding gems | |||||
| * | | Add Public Api for register new extensions for Rake Notes | robertomiranda | 2014-03-14 | 2 | -15/+29 | |
| | | | ||||||
* | | | Fix assertions | Carlos Antonio da Silva | 2014-03-16 | 1 | -2/+2 | |
| | | | ||||||
* | | | Let COMMAND_WHITELIST be an Array, not a String | Akira Matsuda | 2014-03-16 | 1 | -1/+1 | |
| | | | ||||||
* | | | better test error messages | schneems | 2014-03-14 | 1 | -4/+4 | |
| | | | ||||||
* | | | Force sass-rails ~> 4.0.2 to avoid sprockets compatibility error | Rafael Mendonça França | 2014-03-14 | 1 | -1/+1 | |
|/ / | | | | | | | See https://github.com/rails/sass-rails/issues/191 for more information | |||||
* | | require actions rather than create_file | Aaron Patterson | 2014-03-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | thor's create_file seems to have a circular dependency on itself when used with our constant loading stuff. fixes #14319 | |||||
* | | Removed unnecessary command "application" | Arun Agrawal | 2014-03-10 | 2 | -6/+5 | |
| | | ||||||
* | | Merge pull request #14262 from sferik/flat_map | Andrew White | 2014-03-09 | 4 | -4/+4 | |
|\ \ | | | | | | | Replace additional instances of map.flatten with flat_map | |||||
| * | | Replace map.flatten with flat_map in railties | Erik Michaels-Ober | 2014-03-04 | 4 | -4/+4 | |
| | | | ||||||
* | | | Make the rails:template rake task load initializers | Robin Dupret | 2014-03-08 | 3 | -1/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Templates could rely on irregular inflections or external libraries for instance so we should load the application's initializers when running the rails:template task. The introducing commit of this feature is f7f11361 ; the initializers have never been loaded invoking this task. Fixes #12133. | |||||
* | | | Introduce `Rails.gem_version` | Prem Sichanugrist | 2014-03-05 | 5 | -11/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method return `Gem::Version.new(Rails.version)`, suggesting a more reliable way to perform version comparison. Example: Rails.version #=> "4.1.2" Rails.gem_version #=> #<Gem::Version "4.1.2"> Rails.version > "4.1.10" #=> false Rails.gem_version > Gem::Version.new("4.1.10") #=> true Gem::Requirement.new("~> 4.1.2") =~ Rails.gem_version #=> true This was originally introduced as `.version` by @charliesome in #8501 but got reverted in #10002 since it was not backward compatible. Also, updating template for `rake update_versions`. | |||||
* | | | Always return an array from formats so there is no need to wrap it when calling | Carlos Antonio da Silva | 2014-03-04 | 3 | -3/+3 | |
| | | | ||||||
* | | | Fix for external generators extend Erb::Generators | Allen Fair | 2014-03-04 | 1 | -1/+1 | |
|/ / | | | | | | | | | | | | | | | | | HAML and probably other generators extend this class and invoke filename_with_extensions with the old signature (without format). This makes the second argument optional and defaults it to the #format method which could be overridden as well. Closes #14132. | |||||
* | | Merge pull request #14195 from robin850/issue-14079 | Guillermo Iguaran | 2014-02-28 | 3 | -2/+23 | |
|\ \ | | | | | | | Avoid namespacing routes inside engines | |||||
| * | | Avoid namespacing routes inside engines | Robin Dupret | 2014-02-26 | 3 | -2/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #11544, invoking the controller generator, any generated route is namespaced according to the class_path method. Since a mountable plugin is namespaced, creating a controller inside would generate a namespaced route based on the engine's name. The controller generator now relies on regular_class_path which does not contain the class hierarchy but the given path. Fixes #14079. | |||||
* | | | Merge pull request #14174 from kuldeepaggarwal/fix-resource_generator_test | Yves Senn | 2014-02-27 | 3 | -5/+5 | |
|\ \ \ | | | | | | | | | fix test cases | |||||
| * | | | modify model generator warning message. refs [#174c9f0] | Kuldeep Aggarwal | 2014-02-27 | 3 | -5/+5 | |
| | | | | ||||||
* | | | | pass strings to the underscore method | Aaron Patterson | 2014-02-26 | 2 | -3/+3 | |
| | | | | ||||||
* | | | | Merge pull request #14149 from tjschuck/bcrypt_gem_rename | Carlos Antonio da Silva | 2014-02-26 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Bump version of bcrypt gem | |||||
| * | | | | Bump version of bcrypt gem | T.J. Schuck | 2014-02-25 | 1 | -1/+1 | |
| | |/ / | |/| | | ||||||
* | | | | Remove inclusion of rubysl gem for rbx on generated Gemfile | Carlos Antonio da Silva | 2014-02-25 | 2 | -16/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From #14026: Specific rbx-2 to limit testing on Rubinius 2.x (since there will be other versions of Rubinius > 2.x soon). Also, as of Rubinius 2.2.5, it is no longer necessary to bundle the rubysl gem. This is what Rails master/4.1 supports, so we don't need to add rubysl to gemfiles anymore. | |||||
* | | | | [skip ci] Fix test name typo in app generator tests. | Spencer Rogers | 2014-02-25 | 1 | -1/+1 | |
|/ / / | ||||||
* / / | Point master changelogs to 4-1-stable branch | Carlos Antonio da Silva | 2014-02-25 | 1 | -312/+1 | |
|/ / | | | | | | | Remove 4-1 related entries from master [ci skip] | |||||
* | | build fix. follow up to 174c9f0df39cd338a4871f82794256cc64f68a81 | Yves Senn | 2014-02-24 | 1 | -1/+1 | |
| | | ||||||
* | | include names in model generator warning message. refs #13515. | Yves Senn | 2014-02-24 | 2 | -5/+7 | |
| | | | | | | | | | | | | This is a follow up to #13515. It includes the name given and the singularized version in the warning message. This will aide the user to see wether the detected singular was right or not. | |||||
* | | Group assets options in production env template | Carlos Antonio da Silva | 2014-02-23 | 1 | -6/+4 | |
| | | ||||||
* | | update version to 4.2.0.alpha | Yves Senn | 2014-02-23 | 1 | -2/+2 | |
| | | ||||||
* | | Merge pull request #13515 from kuldeepaggarwal/f-model-generation | Godfrey Chan | 2014-02-22 | 5 | -12/+40 | |
|\ \ | | | | | | | Added warning when user tried to create model with pluralize name. | |||||
| * | | Add warning when user tried to create model with pluralize name. | Kuldeep Aggarwal | 2014-02-23 | 5 | -12/+40 | |
| | | | | | | | | | | | | | | | 1. Generate model with correct_name. 2. It will help new users to avoid mistakes when tried to create model with wrong name. | |||||
* | | | Revert "Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665." | Guillermo Iguaran | 2014-02-21 | 3 | -26/+2 | |
|/ / | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e0a521cfcd13e4d1f0ae8ab96004289e1c020f71. Conflicts: railties/CHANGELOG.md We expect loggers to quack like stdlib logger. If log4r needs different level= assignment, using a Logger-quacking wrapper is the way to do it. Fixes #14114. | |||||
* | | Merge branch '4-1-0-beta2' | Rafael Mendonça França | 2014-02-18 | 1 | -1/+1 | |
|\ \ | | | | | | | | | | | | | | | | Conflicts: actionview/CHANGELOG.md activerecord/CHANGELOG.md | |||||
| * | | Preparing for 4.1.0.beta2 release | Rafael Mendonça França | 2014-02-18 | 1 | -1/+1 | |
| | | |