| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
|
| |
- 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.)
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Generated engines should call `protect_from_forgery`. If this method
isn't called, then the Engine could be susceptible to XSS attacks.
Thanks @tomekr for reporting this to us!
Conflicts:
railties/lib/rails/generators/rails/plugin/templates/app/controllers/%namespaced_name%/application_controller.rb.tt
railties/test/generators/plugin_generator_test.rb
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
* 3-2-sec:
bumping version
allow :file to be outside rails root, but anything else must be inside the rails view directory
Don't short-circuit reject_if proc
stop caching mime types globally
use secure string comparisons for basic auth username / password
|
| | |
|
|/ |
|
| |
|
|
|
|
|
| |
Instead show a error message asking users to add the gem to their
Gemfile if test-unit could not be loaded.
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
Before this patch configuration set using config.active_support
would not be set.
Closes #15364
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
Comply with current umask when generating new app
Conflicts:
railties/lib/rails/generators/rails/app/app_generator.rb
|
| |
|
|
|
|
|
|
| |
Conflicts:
railties/guides/rails_guides.rb
railties/lib/rails/tasks/documentation.rake
|
|\ |
|
| | |
|
| | |
|
| | |
|
| | |
|
|/
|
|
|
|
|
| |
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.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Minitest expects the first argument in `ARGV` to be the path to a test file.
Because `rails benchmarker` and `rails profiler` define an on-the-fly test-case,
using the first `ARGV` to pass the code to execute this results in:
```
/Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:167:in `block in non_options': file not found: 1000.times{"a string"} (ArgumentError)
from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:146:in `map!'
from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:146:in `non_options'
from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:207:in `non_options'
from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:52:in `process_args'
from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/minitest/unit.rb:891:in `_run'
from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/minitest/unit.rb:884:in `run'
from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:21:in `run'
from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:326:in `block (2 levels) in autorun'
from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:27:in `run_once'
from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:325:in `block in autorun'
```
clearing ARGV after defining the test-case solves this issue.
|
| |
|
|
|
|
|
| |
Closes #11076
[ci skip]
|
|
|
|
|
|
| |
Since docrails as moved from lifo/docrails to rails/docrails we have
to ask for commit rights or submit patches directly to the rails
repository
|
|
|
|
|
| |
memory_store is the default cache store implementation if you call
ActiveSupport::Cache.lookup_store without arguments.
|
|
|
|
| |
[ci skip]
|
|\
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
|\ \
| | |
| | | |
Using secure source https://rubygems.org when generating new plugin with Rails 3.2
|
| | | |
|
|/ /
| |
| |
| | |
Closes #10241 [ci skip]
|