| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Sometimes the modification time hasn't changed so the reloader
doesn't pick up the changed files. This is especially true when
booting the app and then modifying files.
|
|
|
|
|
|
| |
Previously, flushing all logs in Ruby 2.0 and later would raise an
exception when there was no DATABASE_URL or database.yml. Whatever
was the cause of that seems to have been fixed in Ruby 2.3.
|
|
|
|
|
|
|
|
| |
- Set sudo: false in .travis.yml which uses latest travis engine and fixes some failing specs
- Use older version of gems in Gemfile if RUBY_VERSION < '1.9.3' (no change to .gemspec)
- Fix two cases of hash rockets in tests (required for Ruby 1.8.7)
- Skip failing test "test_ensure_that_migration_tasks_work_with_mountable_option" which breaks due to Bundler no longer accepting the default generated .gemspec format.
- Skip railties specs on Ruby 1.8.7 (mark as an allowed failure.)
|
| |
|
|
|
|
|
|
|
| |
Before this patch configuration set using config.active_support
would not be set.
Closes #15364
|
| |
|
| |
|
|
|
|
|
|
|
| |
Journey doesn't clear its named route hash when the routes are reloaded but
Rails 3.2 isn't affected because Journey overwrites the existing route. This
is just a backport of the test to make sure it doesn't become affected in
some future release.
|
|\
| |
| |
| |
| |
| |
| | |
backport runner fixes to 3-2-stable
Conflicts:
railties/CHANGELOG.md
|
| |
| |
| |
| |
| |
| |
| | |
Add a runner hook to Rails::Application and Rails::Engine that requires
ActiveRecord::Base to avoid circular constant loading when using observers.
This commit backports cc7dd66, c0ba0f0 and 8d01c61.
|
| |
| |
| | |
3-2 behaves different when scaffolding.
|
| |
| |
| |
| | |
Fix tests related to scaffolding generator with --assets=false switch
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes Scaffold generator with --assets=false
Conflicts:
railties/CHANGELOG.md
Conflicts:
railties/CHANGELOG.md
railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
|
| | |
|
| |
| |
| |
| | |
db:fixtures:load.
|
| |
| |
| |
| | |
Ruby 2.0 Object#inspect does not call #to_s by default anymore.
|
| | |
|
| | |
|
| | |
|
| | |
|
|/
|
|
|
|
|
|
|
| |
Conflicts:
railties/CHANGELOG.md
railties/lib/rails/generators/test_unit/model/model_generator.rb
railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
railties/test/generators/model_generator_test.rb
|
| |
|
|
|
|
|
|
|
|
| |
Clear url helper methods when routes are reloaded by removing the
methods explicitly rather than just clearing the module because it
didn't work properly and could be the source of a memory leak.
Closes #8488.
|
|
|
|
|
|
|
|
|
|
|
| |
The `plugin new` generator always adds the dummy app rake tasks,
when a dummy app was created.
Closes #8224
Conflicts:
railties/CHANGELOG.md
|
| |
|
|
|
|
| |
This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backport for #7521
- added tests to confirm establish_connection uses DATABASE_URL and
Rails.env correctly even when no arguments are passed in.
- updated rake db tasks to support DATABASE_URL, and added tests to
confirm correct behavior for these rake tasks. (Removed
establish_connection call from some tasks since in those cases
the :environment task already made sure the function would be called)
- updated Resolver so that when it resolves the database url, it
removes hash values with empty strings from the config spec (e.g.
to support connection to postgresql when no username is specified).
- updated ResolverTest to use current_adapter? to check the type of
the current adapter.
|
| |
|
|
|
|
|
|
|
|
| |
Master branch: Fixed generated whitespace in routes when using namespaced resource.
Merge pull request #7811 from iHiD/resource_generator_routes_master
Fix the build (Broken scaffold routes test)
|
|
|
|
| |
Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
|
| |
|
|
|
|
|
|
|
| |
logs.
Conflicts:
railties/test/application/rack/logger_test.rb
|
| |
|
|
|
|
|
| |
Problem : Edge rails can't bundle
Fixes #7437
|
|
|
|
| |
Logical paths to compile should require an extension
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
Fix: 'rake rails:templates:copy' doesn't work
Conflicts:
railties/test/application/rake_test.rb
|
|
|
|
| |
(closes #6672)
|
|\
| |
| | |
Fix issue 6673
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|/ |
|
|
|
|
|
|
|
|
|
| |
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).
|
|
|
|
|
|
|
| |
'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.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|