| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | We should not include engine.rake file into rake | Arun Agrawal | 2012-06-08 | 2 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | Removed protected as we already doing it above. | Arun Agrawal | 2012-06-08 | 1 | -2/+0 | |
| |/ | ||||||
| * | Revert "fix the Flash middleware loading the session on every request (very ↵ | Rafael Mendonça França | 2012-06-05 | 1 | -20/+0 | |
| | | | | | | | | | | dangerous especially with Rack::Cache), it should only be loaded when the flash method is called" This reverts commits e3069c64b2c5ddc7a5789b55b8efd4902d9e9729 and 2b2983d76fd11efc219273036a612f47cfaa5bfa. Reason: This add a non-backward compatible change in the way that flash works now (swept in every request). | |||||
| * | 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 | 2 | -2/+2 | |
| |\ | | | | | | | | | | | | | | | * 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 | |
| | | | ||||||
| | * | updating changelogs | 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 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | '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. | |||||
| * | | Remove irrelevant assertion | Oscar Del Ben | 2012-05-29 | 1 | -7/+0 | |
| | | | ||||||
| * | | Display annotations from .coffee files in `rake notes` | Bartlomiej Kozal | 2012-05-28 | 2 | -7/+18 | |
| |/ | ||||||
| * | Fix railties_order when application object is passed | Piotr Sarnacki | 2012-05-27 | 2 | -1/+5 | |
| | | | | | | | | | | | | | | | | 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 | 3 | -4/+4 | |
| | | | | | | | | 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. | |||||
| * | More info on commit messages in contributing guide | Piotr Sarnacki | 2012-05-21 | 1 | -1/+33 | |
| | | | | | | | | | | Add more info on how to write a good commit messages along with example showing nicely formatted commit message. Rails git history does not look too well when you try to figure out why particular changes were introduced. We can do much better than that and it's never too late to start. | |||||
| * | Fix generators to help with ambiguous `ApplicationController` issue | Piotr Sarnacki | 2012-05-20 | 4 | -5/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | |||||
| * | :foreign_key option should be on has_many side of association | Mikhail Dieterle | 2012-05-13 | 1 | -2/+2 | |
| | | ||||||
| * | Update 'getting started' guides for new whitelist security implementation. ↵ | Erich Menge | 2012-05-12 | 1 | -1/+16 | |
| | | | | | Closes #6286. | |||||
| * | Give more detailed instructions in script/rails in engine | Piotr Sarnacki | 2012-05-04 | 1 | -0/+4 | |
| | | | | | closes #4894 | |||||
| * | improvements in "caching_with_rails" guide - backported from docrails | kucaahbe | 2012-05-04 | 1 | -8/+10 | |
| | | | | | | | Conflicts: railties/guides/source/caching_with_rails.textile | |||||
| * | Added test for assets:precompile for index files | Dmitry Vorotilin | 2012-05-01 | 1 | -0/+9 | |
| | | ||||||
| * | Failing test for #6034 | Piotr Sarnacki | 2012-04-30 | 1 | -0/+20 | |
| | | ||||||
| * | Lazy load `default_form_builder` if it's passed as a string | Piotr Sarnacki | 2012-04-28 | 1 | -1/+1 | |
| | | | | | closes #3341 | |||||
| * | Allow Thor 0.15 and 1.0, to be released shortly | tomhuda | 2012-04-28 | 1 | -1/+5 | |
| | | ||||||
| * | 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. | |||||
| * | Merge pull request #5919 from joevandyk/rake-dsl-fix | Jeremy Kemper | 2012-04-23 | 1 | -1/+1 | |
| |\ | | | | | Only include Rake::DSL if it's defined (Rake >= 0.9) | |||||
| | * | 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. | |||||
| * | | Updated other README to point 3-2-stable | Arun Agrawal | 2012-04-23 | 1 | -1/+1 | |
| |/ | ||||||
| * | Add hook for add_resource_route | Santiago Pastorino | 2012-04-18 | 4 | -7/+21 | |
| | | ||||||
| * | Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a more ↵ | Aditya Sanghi | 2012-04-17 | 4 | -5/+5 | |
| | | | | | maintained debugger gem | |||||
| * | "rails new -h" shows message in rails directory | ask | 2012-04-13 | 2 | -3/+17 | |
| | | ||||||
| * | Fix code example in generator test case | Prem Sichanugrist | 2012-04-12 | 1 | -2/+2 | |
| | | ||||||
| * | rewords the section about default_url_options in the Action Controller ↵ | Xavier Noria | 2012-04-09 | 1 | -3/+4 | |
| | | | | | Overview guide | |||||
| * | Merge pull request #5784 from rafaelfranca/default_url-3-2 | Santiago Pastorino | 2012-04-08 | 1 | -2/+2 | |
| |\ | | | | | [3-2-stable] Document that default_url_options must return a hash with symbolized keys | |||||
| | * | Document that default_url_options must return a hash with symbolized | Rafael Mendonça França | 2012-04-09 | 1 | -0/+1 | |
| | | | | | | | | | keys | |||||
| | * | default_url_options does not receive one argument anymore | Rafael Mendonça França | 2012-04-08 | 1 | -2/+1 | |
| | | | ||||||
| * | | Fix 'Everyday Git' link | Anil Wadghule | 2012-04-07 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix Rails version in getting started guide. | Anil Wadghule | 2012-04-06 | 1 | -4/+4 | |
| |/ | ||||||
| * | log which config format AR uses to connect with | Terence Lee | 2012-04-03 | 1 | -0/+19 | |
| | | ||||||
| * | test initializer logic for DATABASE_URL env var | Terence Lee | 2012-04-03 | 1 | -0/+43 | |
| | | ||||||
| * | Usage file in generators shouldn't be fetched only based on source_root | Piotr Sarnacki | 2012-04-02 | 3 | -5/+22 | |
| | | | | | | | | | 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 | |
| | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |