Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Explictly set the assets digest option to false | Rafael Mendonça França | 2012-09-20 | 1 | -2/+5 |
| | |||||
* | We need to have 1-0-stable for joureny gem in edge | Arun Agrawal | 2012-08-24 | 1 | -1/+2 |
| | | | | | Problem : Edge rails can't bundle Fixes #7437 | ||||
* | Fix invalid asset compile assertions | Joshua Peek | 2012-08-07 | 1 | -3/+2 |
| | | | | Logical paths to compile should require an extension | ||||
* | make assertions easier to track down | Aaron Patterson | 2012-08-07 | 1 | -9/+17 |
| | |||||
* | html_escape should escape single quotes | Santiago Pastorino | 2012-08-02 | 1 | -2/+2 |
| | | | | | | | | | | | | https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content Closes #7215 Conflicts: actionpack/test/template/erb_util_test.rb actionpack/test/template/form_tag_helper_test.rb actionpack/test/template/text_helper_test.rb actionpack/test/template/url_helper_test.rb activesupport/lib/active_support/core_ext/string/output_safety.rb | ||||
* | Merge pull request #6690 from suginoy/fix-templates-copy | Rafael Mendonça França | 2012-06-11 | 1 | -0/+12 |
| | | | | | | 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/+8 |
| | | | | (closes #6672) | ||||
* | Merge pull request #6678 from arunagw/fix_issue_6673 | Rafael Mendonça França | 2012-06-08 | 1 | -0/+8 |
|\ | | | | | Fix issue 6673 | ||||
| * | We should not include engine.rake file into rake | Arun Agrawal | 2012-06-08 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | 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). | ||||
* | 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. | ||||
* | 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 | 1 | -5/+16 |
| | |||||
* | Fix railties_order when application object is passed | Piotr Sarnacki | 2012-05-27 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | 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 | 1 | -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 | 1 | -5/+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 | ||||
* | 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 |
| | |||||
* | Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a more ↵ | Aditya Sanghi | 2012-04-17 | 1 | -2/+2 |
| | | | | maintained debugger gem | ||||
* | "rails new -h" shows message in rails directory | ask | 2012-04-13 | 1 | -0/+10 |
| | |||||
* | 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 | 2 | -1/+5 |
| | | | | | | | | 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`. | ||||
* | Add arel branch to the tests | Rafael Mendonça França | 2012-03-27 | 1 | -1/+1 |
| | |||||
* | Fix GH #5411. When precompiling, params method is undefined. | kennyj | 2012-03-22 | 1 | -0/+12 |
| | |||||
* | [3-2-stable] Port of #5522 'Fix adding/removing field's index when ↵ | Marcelo Silveira | 2012-03-21 | 1 | -0/+18 |
| | | | | generating migration' | ||||
* | [3-2-stable] Remove blank line from generated migration | Marcelo Silveira | 2012-03-20 | 1 | -0/+1 |
| | |||||
* | Build fix for app_generator_test.rb | Arun Agrawal | 2012-03-18 | 1 | -1/+1 |
| | |||||
* | Fix GH #5435. db:structure:dump should be re-enable. | kennyj | 2012-03-18 | 1 | -0/+12 |
| | |||||
* | Use Ruby 1.8 hash syntax | Rafael Mendonça França | 2012-03-13 | 2 | -8/+32 |
| | |||||
* | Use the attributes hash explicitly | Rafael Mendonça França | 2012-03-13 | 2 | -6/+26 |
| | |||||
* | Do not use the attributes hash in the scaffold functional tests | Rafael Mendonça França | 2012-03-13 | 2 | -2/+9 |
| | |||||
* | Now all the models need to explicitly declare the accessible attributes | Rafael Mendonça França | 2012-03-04 | 1 | -0/+1 |
| | |||||
* | Only add the whitelist_attributes option if ActiveRecord is present | Rafael Mendonça França | 2012-03-04 | 2 | -1/+7 |
| | | | | | | | 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 | -0/+10 |
| | | | | 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. | ||||
* | --edge option should generate app with rails 3-2-stable | Guillermo Iguaran | 2012-02-07 | 2 | -3/+3 |
| | |||||
* | Fix plugin_new test failure from c8c84397 | Prem Sichanugrist | 2012-02-01 | 2 | -3/+7 |
| | | | | | `plugin_new` generator doesn't generate `sass-rails` in the Gemfile, so you can't check for that. | ||||
* | Fix GH #4749. Remove branch options, because edge is not 3-2-stable. | kennyj | 2012-02-01 | 1 | -0/+5 |
| | |||||
* | fix assets test | Sergey Nartimov | 2012-01-31 | 1 | -1/+1 |
| | |||||
* | Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fine with ↵ | José Valim | 2012-01-22 | 1 | -3/+3 |
| | | | | bash, zsh, etc, closes #4602 | ||||
* | Add default charset config to ActionDispatch | Carlos Antonio da Silva | 2012-01-17 | 1 | -0/+8 |
| | |||||
* | Don't hardcode assets route skipped in route inspector | Guillermo Iguaran | 2012-01-15 | 1 | -0/+15 |
| | | | | | | Conflicts: railties/lib/rails/application/route_inspector.rb | ||||
* | No AS::TestCase here. | José Valim | 2012-01-13 | 1 | -1/+1 |
| | |||||
* | config.force_ssl should mark the session as secure. | José Valim | 2012-01-13 | 1 | -0/+30 |
| | |||||
* | Merge pull request #4451 from guilleiguaran/add-therubyracer-commented | José Valim | 2012-01-13 | 1 | -4/+2 |
| | |||||
* | Remove duplicated test line which was causing Ci failures on 1.8.7. | José Valim | 2012-01-10 | 1 | -1/+0 |
| | |||||
* | Remove dead code | Santiago Pastorino | 2012-01-10 | 1 | -4/+0 |
| | |||||
* | Rails initialization with initialize_on_precompile = false should set assets_dir | Santiago Pastorino | 2012-01-10 | 1 | -0/+6 |
| | |||||
* | Add ORIGINAL_FULLPATH to env | Piotr Sarnacki | 2012-01-10 | 2 | -1/+37 |
| | | | | | | | | | | | This behaves similarly to REQUEST_URI, but we need to implement it on our own because REQUEST_URI is not reliable. Note that since PATH_INFO does not contain information about trailing question mark, this is not 100% accurate, for example `/foo?` will result in `/foo` in ORIGINAL_FULLPATH |