| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #6690 from suginoy/fix-templates-copy | Rafael Mendonça França | 2012-06-11 | 1 | -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 new | Piotr Sarnacki | 2012-06-08 | 1 | -0/+2 |
| | | | | | (closes #6672) | ||||
| * | We should not include engine.rake file into rake | Arun Agrawal | 2012-06-08 | 1 | -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' }` option | Carlos Galdino | 2012-06-05 | 1 | -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 generators | Akira Matsuda | 2012-06-01 | 2 | -2/+2 |
| | | |||||
| * | bumping to 3.2.5 | Aaron Patterson | 2012-05-31 | 1 | -1/+1 |
| | | |||||
| * | Merge branch '3-2-rel' into 3-2-stable | Aaron Patterson | 2012-05-31 | 1 | -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.4 | Aaron Patterson | 2012-05-31 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch '3-2-stable-sec' into 3-2-stable | Aaron Patterson | 2012-05-31 | 1 | -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.rc1 | Aaron Patterson | 2012-05-28 | 1 | -2/+2 |
| | | | |||||
| * | | Changed symbol platform to platforms for the commented out call to gem ↵ | Martin O'Connor | 2012-05-30 | 1 | -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 Kozal | 2012-05-28 | 1 | -2/+2 |
| |/ | |||||
| * | Fix railties_order when application object is passed | Piotr Sarnacki | 2012-05-27 | 1 | -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 controllers | Piotr Sarnacki | 2012-05-22 | 2 | -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` issue | Piotr Sarnacki | 2012-05-20 | 3 | -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 Cardarella | 2012-05-15 | 1 | -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 apps | José Valim | 2012-05-14 | 1 | -2/+2 |
| | | |||||
| * | Update railties/lib/rails/generators/rails/app/templates/config/application.rb | Egor Homakov | 2012-05-14 | 1 | -0/+3 |
| | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Give more detailed instructions in script/rails in engine | Piotr Sarnacki | 2012-05-04 | 1 | -0/+4 |
| | | | | | closes #4894 | ||||
| * | Merge pull request #4528 from j-manu/log-tailer-fix | Aaron Patterson | 2012-04-27 | 1 | -3/+7 |
| | | | | | Fix for log tailer when the log file doesn't exist. | ||||
| * | Only include Rake::DSL if it's defined. | Joe Van Dyk | 2012-04-21 | 1 | -1/+1 |
| | | | | | rake < 0.9 doesn't define Rake::DSL. | ||||
| * | Add hook for add_resource_route | Santiago Pastorino | 2012-04-18 | 3 | -7/+16 |
| | | |||||
| * | Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a more ↵ | Aditya Sanghi | 2012-04-17 | 1 | -1/+1 |
| | | | | | maintained debugger gem | ||||
| * | "rails new -h" shows message in rails directory | ask | 2012-04-13 | 1 | -3/+7 |
| | | |||||
| * | Fix code example in generator test case | Prem Sichanugrist | 2012-04-12 | 1 | -2/+2 |
| | | |||||
| * | Usage file in generators shouldn't be fetched only based on source_root | Piotr Sarnacki | 2012-04-02 | 1 | -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-stable | Santiago Pastorino | 2012-03-30 | 1 | -1/+1 |
| |\ | |||||
| | * | Bump up to 3.2.3 | Santiago Pastorino | 2012-03-30 | 1 | -1/+1 |
| | | | |||||
| | * | Bumping to 3.2.3.rc2 | Santiago Pastorino | 2012-03-29 | 1 | -1/+1 |
| | | | |||||
| | * | fix incorrect url in the deprecation message for vendor/plugins [ci skip] | Vijay Dev | 2012-03-29 | 1 | -1/+1 |
| | | | |||||
| * | | fix incorrect url in the deprecation message for vendor/plugins [ci skip] | Vijay Dev | 2012-03-29 | 1 | -1/+1 |
| | | | |||||
| * | | Changed the config.assets.manifest to nil in the comments in the production ↵ | Anuj Dutta | 2012-03-28 | 1 | -1/+1 |
| | | | | | | | | | config template. | ||||
| * | | adding a branch to arel | Aaron Patterson | 2012-03-27 | 1 | -2/+2 |
| |/ | |||||
| * | Bumping to 3.2.3.rc1 | Santiago Pastorino | 2012-03-27 | 1 | -2/+2 |
| | | |||||
| * | chdir before globbing so that we don't need to escape directory names. | Aaron Patterson | 2012-03-23 | 1 | -1/+30 |
| | | | | | fixes #5521 | ||||
| * | Rubyracer does not work on ruby, so add it to Gemfile with :ruby platform only | Piotr Sarnacki | 2012-03-17 | 1 | -1/+1 |
| | | |||||
| * | Check for existence of exactly the called `fixture_path=` method | Piotr Sarnacki | 2012-03-15 | 1 | -2/+2 |
| | | |||||
| * | Use Ruby 1.8 hash syntax | Rafael Mendonça França | 2012-03-13 | 1 | -1/+1 |
| | | |||||
| * | Use the attributes hash explicitly | Rafael Mendonça França | 2012-03-13 | 2 | -6/+18 |
| | | |||||
| * | Do not use the attributes hash in the scaffold functional tests | Rafael Mendonça França | 2012-03-13 | 2 | -2/+11 |
| | | |||||
| * | Fixed problem when fixture_path is not always defined (incidentally, only ↵ | Philip Arndt | 2012-03-13 | 1 | -1/+3 |
| | | | | | when ActiveRecord is according to test_help.rb). | ||||
| * | Fixes issue #5193 using the instructions provided in the issue. | Philip Arndt | 2012-03-13 | 1 | -0/+3 |
| | | |||||
| * | Fix typo in isolated engine docs | Caius Durling | 2012-03-09 | 1 | -1/+1 |
| | | |||||
| * | Only add the whitelist_attributes option if ActiveRecord is present | Rafael Mendonça França | 2012-03-04 | 1 | -1/+1 |
| | | | | | | | | Conflicts: railties/test/generators/app_generator_test.rb railties/test/isolation/abstract_unit.rb | ||||
| * | Whitelist all attribute assignment by default. | Michael Koziarski | 2012-03-05 | 1 | -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.2 | Aaron Patterson | 2012-03-01 | 1 | -1/+1 |
| | | |||||
| * | updating RAILS_VERSION | Aaron Patterson | 2012-02-22 | 1 | -2/+2 |
| | | |||||
| * | Fix that failed tests should exit with a nonzero error code. | Jeremy Kemper | 2012-02-10 | 2 | -31/+17 |
| | | | | | | | Partially reverts 14c89e7285d4e7cd40a542fbc31d9345f60c3aa4. Hat tip to @tenderlove for paring down the TestTask! | ||||
| * | always flush all logs. fixes #4277 | Aaron Patterson | 2012-02-07 | 1 | -1/+1 |
| | | |||||
| * | --edge option should generate app with rails 3-2-stable | Guillermo Iguaran | 2012-02-07 | 1 | -1/+1 |
| | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |