aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Collapse)AuthorAgeFilesLines
* Bump to 3.2.8Santiago Pastorino2012-08-091-1/+1
|
* Bump to 3.2.8.rc2Santiago Pastorino2012-08-031-1/+1
|
* Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` atRafael Mendonça França2012-08-021-1/+1
| | | | | | | the ERB scaffold generator. We are trying to teach the data attributes as best practices and `:confirm` will be deprecated in 4.0.
* Bump to 3.2.8.rc1Santiago Pastorino2012-08-011-2/+2
|
* Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` ↵Rafael Mendonça França2012-08-011-1/+1
| | | | | | | | | | | option" Revert "Deprecate `:disable_with` in favor of `'data-disable-with'` option for `button_to` and `submit_tag` helpers." This reverts commit fc092a9cba5fceec38358072e50e09250cf58840. This reverts commit e9051e20aeb2c666db06b6217954737665878db7. This reverts commit d47d6e7eda3aa3e6aa28d0c17ac6801234bb97d1. This reverts commit 21141e777bdce8534e3755c8de7268324b3d8714.
* Merge pull request #7070 from jmazzi/3-2-stableRafael Mendonça França2012-08-011-3/+6
|\ | | | | Update documentation for Rails::Application#env_config
| * Update documentation for Rails::Application#env_configJustin Mazzi2012-07-161-3/+6
| |
* | Merge pull request #7147 from pferdefleisch/scaffold_controller_docsRafael Mendonça França2012-07-311-4/+3
| | | | | | | | Updated scaffold_controller generator docs #7146
* | Backport #6995 to 3-2 stableFrancesco Rodriguez2012-07-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Update `test_help` to config properly turn natural language option. Last versions of Turn don't monkey patch MiniTest to setup the natural language option. Here is an [example](https://github.com/TwP/turn/blob/master/try/test_autorun_minitest.rb#L3). This patches the following behaviour: $ rake test:units `<top (required)>': undefined method `use_natural_language_case_names=' for MiniTest::Unit:Class (NoMethodError)
* | bumping to 3.2.7Aaron Patterson2012-07-261-1/+1
| |
* | updating the versionAaron Patterson2012-07-231-2/+2
|/
* Use strict_args_position! if available from ThorJosé Valim2012-06-181-0/+1
|
* bumping version numbersAaron Patterson2012-06-111-1/+1
|
* Merge pull request #6690 from suginoy/fix-templates-copyRafael Mendonça França2012-06-111-1/+1
| | | | | | Fix: 'rake rails:templates:copy' doesn't work Conflicts: railties/test/application/rake_test.rb
* Don't add sqlite3 to gemspec with -O on rails plugin newPiotr Sarnacki2012-06-081-0/+2
| | | | (closes #6672)
* We should not include engine.rake file into rakeArun Agrawal2012-06-081-1/+1
| | | | | | | | | | if we are passing -T which is skip_test_unit See issue #6673 for more details. I saw that we are not creating dummy app even if we do skip_test_unit. Fixes #6673
* Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` optionCarlos Galdino2012-06-051-1/+1
| | | | | | | | | | | | This deprecation applies to: `button_to` `button_tag` `image_submit_tag` `link_to` `submit_tag` As :confirm is an UI specific option is better to use the data attributes, teaching users about unobtrusive JavaScript and how Rails works with it.
* remove unneeded blank line from !namespeced? controller generatorsAkira Matsuda2012-06-012-2/+2
|
* bumping to 3.2.5Aaron Patterson2012-05-311-1/+1
|
* Merge branch '3-2-rel' into 3-2-stableAaron Patterson2012-05-311-1/+1
|\ | | | | | | | | | | | | | | * 3-2-rel: bumping to 3.2.4 adding security notifications to CHANGELOGs updating changelogs Merge pull request #6558 from parndt/fix_regression
| * bumping to 3.2.4Aaron Patterson2012-05-311-1/+1
| |
* | Merge branch '3-2-stable-sec' into 3-2-stableAaron Patterson2012-05-311-2/+2
|\| | | | | | | | | | | | | * 3-2-stable-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this bumping to 3.2.4.rc1
| * bumping to 3.2.4.rc1Aaron Patterson2012-05-281-2/+2
| |
* | Changed symbol platform to platforms for the commented out call to gem ↵Martin O'Connor2012-05-301-1/+1
| | | | | | | | | | | | | | 'therubyracer'. Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms. Updating tests.
* | Display annotations from .coffee files in `rake notes`Bartlomiej Kozal2012-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
|