aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* bumping to 3.2.4.rc1Aaron Patterson2012-05-281-2/+2
|
* Fix railties_order when application object is passedPiotr Sarnacki2012-05-271-1/+1
| | | | | | | | | | | | | | | railites_order method, introduced in 40b19e0, had a bug that was causing loading application instance twice in initializers if railties_order already included application instance. So for example railties_order = [Foo::Engine, :main_app, Bar::Engine] would result in such railties array: [MyApp::Application, Foo::Engine, MyAppApplication, Bar::Engine] In order to fix it, we need to check for existence of application in both railties_order and railties arrays.
* Use require_dependency in generated controllersPiotr Sarnacki2012-05-222-2/+2
| | | | | | | Using require in development mode will prevent required files from reloading, even if they're changed. In order to keep namespaced application_controller reloadable, we need to use require_dependency instead of require.
* Fix generators to help with ambiguous `ApplicationController` issuePiotr Sarnacki2012-05-203-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In development mode, dependencies are loaded dynamically at runtime, using `const_missing`. Because of that, when one of the constants is already loaded and `const_missing` is not triggered, user can end up with unexpected results. Given such file in an Engine: ```ruby module Blog class PostsController < ApplicationController end end ``` If you load it first, before loading any application files, it will correctly load `Blog::ApplicationController`, because second line will hit `const_missing`. However if you load `ApplicationController` first, the constant will be loaded already, `const_missing` hook will not be fired and in result `PostsController` will inherit from `ApplicationController` instead of `Blog::ApplicationController`. Since it can't be fixed in `AS::Dependencies`, the easiest fix is to just explicitly load application controller. closes #6413
* Changing the indentation level of the block comment close for SASS Brian Cardarella2012-05-151-1/+1
| | | If one wants to use use SASS for application.css.sass the comment block indentation is invalid.
* Default escape_html_entities_in_json to true in new appsJosé Valim2012-05-141-2/+2
|
* Update railties/lib/rails/generators/rails/app/templates/config/application.rbEgor Homakov2012-05-141-0/+3
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Give more detailed instructions in script/rails in enginePiotr Sarnacki2012-05-041-0/+4
| | | | closes #4894
* Merge pull request #4528 from j-manu/log-tailer-fixAaron Patterson2012-04-271-3/+7
| | | | Fix for log tailer when the log file doesn't exist.
* Only include Rake::DSL if it's defined.Joe Van Dyk2012-04-211-1/+1
| | | | rake < 0.9 doesn't define Rake::DSL.
* Add hook for add_resource_routeSantiago Pastorino2012-04-183-7/+16
|
* Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a more ↵Aditya Sanghi2012-04-171-1/+1
| | | | maintained debugger gem
* "rails new -h" shows message in rails directoryask2012-04-131-3/+7
|
* Fix code example in generator test casePrem Sichanugrist2012-04-121-2/+2
|
* Usage file in generators shouldn't be fetched only based on source_rootPiotr Sarnacki2012-04-021-4/+17
| | | | | | | | In case `source_roout` is not set, `default_source_root` is used, which includes also `templates` directory. If there is no `templates` directory, `default_source_root` is not available and USAGE will not be displayed. USAGE should be also checked based on default directory excluding `templates`.
* Merge branch '3-2-3' into 3-2-stableSantiago Pastorino2012-03-301-1/+1
|\
| * Bump up to 3.2.3Santiago Pastorino2012-03-301-1/+1
| |
| * Bumping to 3.2.3.rc2Santiago Pastorino2012-03-291-1/+1
| |
| * fix incorrect url in the deprecation message for vendor/plugins [ci skip]Vijay Dev2012-03-291-1/+1
| |
* | fix incorrect url in the deprecation message for vendor/plugins [ci skip]Vijay Dev2012-03-291-1/+1
| |
* | Changed the config.assets.manifest to nil in the comments in the production ↵Anuj Dutta2012-03-281-1/+1
| | | | | | | | config template.
* | adding a branch to arelAaron Patterson2012-03-271-2/+2
|/
* Bumping to 3.2.3.rc1Santiago Pastorino2012-03-271-2/+2
|
* chdir before globbing so that we don't need to escape directory names.Aaron Patterson2012-03-231-1/+30
| | | | fixes #5521
* Rubyracer does not work on ruby, so add it to Gemfile with :ruby platform onlyPiotr Sarnacki2012-03-171-1/+1
|
* Check for existence of exactly the called `fixture_path=` methodPiotr Sarnacki2012-03-151-2/+2
|
* Use Ruby 1.8 hash syntaxRafael Mendonça França2012-03-131-1/+1
|
* Use the attributes hash explicitlyRafael Mendonça França2012-03-132-6/+18
|
* Do not use the attributes hash in the scaffold functional testsRafael Mendonça França2012-03-132-2/+11
|
* Fixed problem when fixture_path is not always defined (incidentally, only ↵Philip Arndt2012-03-131-1/+3
| | | | when ActiveRecord is according to test_help.rb).
* Fixes issue #5193 using the instructions provided in the issue.Philip Arndt2012-03-131-0/+3
|
* Fix typo in isolated engine docsCaius Durling2012-03-091-1/+1
|
* Only add the whitelist_attributes option if ActiveRecord is presentRafael Mendonça França2012-03-041-1/+1
| | | | | | | Conflicts: railties/test/generators/app_generator_test.rb railties/test/isolation/abstract_unit.rb
* Whitelist all attribute assignment by default.Michael Koziarski2012-03-051-1/+1
| | | | Change the default for newly generated applications to whitelist all attribute assignment. Also update the generated model classes so users are reminded of the importance of attr_accessible.
* bumping to 3.2.2Aaron Patterson2012-03-011-1/+1
|
* updating RAILS_VERSIONAaron Patterson2012-02-221-2/+2
|
* Fix that failed tests should exit with a nonzero error code.Jeremy Kemper2012-02-102-31/+17
| | | | | | Partially reverts 14c89e7285d4e7cd40a542fbc31d9345f60c3aa4. Hat tip to @tenderlove for paring down the TestTask!
* always flush all logs. fixes #4277Aaron Patterson2012-02-071-1/+1
|
* --edge option should generate app with rails 3-2-stableGuillermo Iguaran2012-02-071-1/+1
|
* Add branch to sass-rails and coffee-rails for apps generated with --dev or ↵Guillermo Iguaran2012-02-061-2/+2
| | | | --edge options (3.2.x)
* Fix GH #4749. Remove branch options, because edge is not 3-2-stable.kennyj2012-02-011-2/+2
|
* clarification to prevent confusing newbies; Passenger/Unicorn are app ↵Michael de Silva2012-01-311-1/+1
| | | | servers, Apache/Nginx are the web servers along with thin a la Heroku etc.
* updating RAILS_VERSIONXavier Noria2012-01-261-1/+1
|
* Merge pull request #4601 from carlosantoniodasilva/patch-1José Valim2012-01-231-0/+1
|\ | | | | Add missing require to Array#wrap in generators action methods
| * Add missing require to Array#wrap in generators action methodsCarlos Antonio da Silva2012-01-221-0/+1
| |
* | Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fine with ↵José Valim2012-01-221-2/+2
|/ | | | bash, zsh, etc, closes #4602
* Fix `$rails_rake_task` global variable warning without replacing the value ↵Jonathan Viney2012-01-221-2/+1
| | | | | | | | of $rails_rake_task if it is already set. Fixes #4591. Signed-off-by: José Valim <jose.valim@gmail.com>
* Preparing for 3.2.0 releaseDavid Heinemeier Hansson2012-01-201-1/+1
|
* Silent Sprockets logger when config.assets.logger is set to falseGuillermo Iguaran2012-01-181-0/+1
|
* Don't hardcode assets route skipped in route inspectorGuillermo Iguaran2012-01-151-1/+1
| | | | | | Conflicts: railties/lib/rails/application/route_inspector.rb
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:19:46 +0000