aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* Dont abbreviate that which needs no abbreviationDavid Heinemeier Hansson2014-04-081-2/+2
|
* Dont encourage aliases now that we have variantsDavid Heinemeier Hansson2014-04-081-1/+0
|
* Use short-form for the scaffold render calls and drop the needless testDavid Heinemeier Hansson2014-04-081-2/+2
|
* Drop in @jeremy's new database.yml template textMatthew Draper2014-04-0911-43/+197
| | | | | In passing, allow multi-word adapters to be referenced in a URL: underscored_name must become hyphened-name.
* Rails.application should be set inside before_configuration hookRafael Mendonça França2014-04-071-1/+3
| | | | Fixes #14620
* Remove useless begin..endCarlos Antonio da Silva2014-04-071-2/+1
|
* Use sass-rails 4.0.3Rafael Mendonça França2014-04-041-1/+1
|
* Ensure we supply Kernel#y for 1.9 tooMatthew Draper2014-04-043-10/+29
| | | | | | | | In 1.9, it doesn't live in its own file, so we'll have to define it ourselves. Check RUBY_VERSION, instead of rescuing the require, because we want this to break if `psych/y` moves in a future Ruby release.
* Explicitly load Kernel#y when starting a consoleMatthew Draper2014-04-041-0/+1
| | | | | | | | Previously, we relied on the IRB-detection in Psych itself. But that doesn't work when we're running under spring: the application boots (and thus psych is required) before we switch to console mode and load IRB. Fixes #14587.
* Revise 'sqlite3:' URL handling for smoother upgradesMatthew Draper2014-04-031-2/+4
| | | | | | | | | | | | | | | | Restore the 4.0 behaviour for 'sqlite3:///', but deprecate it. We'll change to the absolute-path interpretation in 4.2. The current "correct" spellings for in-memory, relative, and absolute URLs, respectively, are: sqlite3::memory: sqlite3:relative/path sqlite3:/full/path Substantially reverses/defers fbb79b517f3127ba620fedd01849f9628b78d6ce. Uncovered by @guilleiguaran while investigating #14495, though that sounds like a different issue.
* Require yaml explicitlyAdrià Planas2014-03-291-0/+1
|
* Merge pull request #12778 from etehtsea/rake-default-fixRafael Mendonça França2014-03-281-1/+1
|\ | | | | | | | | Don't load test env by default. Closes #13241
| * Don't load test env by defaultKonstantin Shabanov2013-11-111-1/+1
| |
* | Edge Rails applications doesn't need to use arel masterRafael Mendonça França2014-03-261-2/+1
| |
* | Fix Generation of proper migration whenKuldeep Aggarwal2014-03-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::Base.pluralize_table_names = false. Previously, generation a migration like this: rails g migration add_column_name_to_user name would not generating the correct table name. Fixes #13426.
* | Merge pull request #14447 from Houdini/gitignoreRafael Mendonça França2014-03-243-1/+7
|\ \ | | | | | | | | | Skip sqlite3 files in .gitignore if no sqlite3 in app
| * | Remove sqlite3 lines from .gitignore if the application is not using sqlite3.Dmitrii Golub2014-03-243-1/+7
| | |
* | | Adding active_model in Rails::InfoAnkit Gupta2014-03-231-1/+1
|/ /
* | Merge pull request #14379 from robertomiranda/rake-notes.configGuillermo Iguaran2014-03-172-15/+26
|\ \ | | | | | | Add Public Api for Register New Extensions for Rake Notes
| * | Add config.annotations, in order to register new extensions for Rake notes ↵robertomiranda2014-03-161-0/+4
| | | | | | | | | | | | at config level
| * | Fix Shadowing extensions variable in Register Annotation Exentsionsrobertomiranda2014-03-161-2/+2
| | |
| * | Supporting .ruby, .yml and .yaml Extension in Rake Notesrobertomiranda2014-03-141-1/+1
| | |
| * | Remove .scss, .sass, .less, .haml, .slim, coffee from Rake Notes. Now we ↵robertomiranda2014-03-141-4/+2
| | | | | | | | | | | | have an API for register it in the corresponding gems
| * | Add Public Api for register new extensions for Rake Notesrobertomiranda2014-03-141-15/+24
| | |
* | | Let COMMAND_WHITELIST be an Array, not a StringAkira Matsuda2014-03-161-1/+1
| | |
* | | Force sass-rails ~> 4.0.2 to avoid sprockets compatibility errorRafael Mendonça França2014-03-141-1/+1
|/ / | | | | | | See https://github.com/rails/sass-rails/issues/191 for more information
* | require actions rather than create_fileAaron Patterson2014-03-131-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 Agrawal2014-03-101-6/+1
| |
* | Merge pull request #14262 from sferik/flat_mapAndrew White2014-03-094-4/+4
|\ \ | | | | | | Replace additional instances of map.flatten with flat_map
| * | Replace map.flatten with flat_map in railtiesErik Michaels-Ober2014-03-044-4/+4
| | |
* | | Make the rails:template rake task load initializersRobin Dupret2014-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Sichanugrist2014-03-052-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 callingCarlos Antonio da Silva2014-03-043-3/+3
| | |
* | | Fix for external generators extend Erb::GeneratorsAllen Fair2014-03-041-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-14079Guillermo Iguaran2014-02-281-2/+2
|\ \ | | | | | | Avoid namespacing routes inside engines
| * | Avoid namespacing routes inside enginesRobin Dupret2014-02-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_testYves Senn2014-02-271-1/+1
|\ \ \ | | | | | | | | fix test cases
| * | | modify model generator warning message. refs [#174c9f0]Kuldeep Aggarwal2014-02-271-1/+1
| |/ /
* | | pass strings to the underscore methodAaron Patterson2014-02-262-3/+3
| | |
* | | Merge pull request #14149 from tjschuck/bcrypt_gem_renameCarlos Antonio da Silva2014-02-261-1/+1
|\ \ \ | | | | | | | | Bump version of bcrypt gem
| * | | Bump version of bcrypt gemT.J. Schuck2014-02-251-1/+1
| |/ /
* / / Remove inclusion of rubysl gem for rbx on generated GemfileCarlos Antonio da Silva2014-02-251-9/+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.
* | include names in model generator warning message. refs #13515.Yves Senn2014-02-241-4/+6
| | | | | | | | | | | | 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 templateCarlos Antonio da Silva2014-02-231-6/+4
| |
* | update version to 4.2.0.alphaYves Senn2014-02-231-2/+2
| |
* | Merge pull request #13515 from kuldeepaggarwal/f-model-generationGodfrey Chan2014-02-223-11/+32
|\ \ | | | | | | Added warning when user tried to create model with pluralize name.
| * | Add warning when user tried to create model with pluralize name.Kuldeep Aggarwal2014-02-233-11/+32
| | | | | | | | | | | | | | | 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 Iguaran2014-02-211-5/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | 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ça2014-02-181-1/+1
|\ \ | | | | | | | | | | | | | | | Conflicts: actionview/CHANGELOG.md activerecord/CHANGELOG.md
| * | Preparing for 4.1.0.beta2 releaseRafael Mendonça França2014-02-181-1/+1
| | |