aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12048 from tjouan/app_generator-bin_perms-umaskAaron Patterson2013-08-271-1/+1
| | | | | | Comply with current umask when generating new app Conflicts: railties/lib/rails/generators/rails/app/app_generator.rb
* Make `rake doc:guides` works again. Fix #10384.Teng Siong Ong2013-08-051-2/+2
| | | | | | Conflicts: railties/guides/rails_guides.rb railties/lib/rails/tasks/documentation.rake
* Preparing for 3.2.14 releaseRafael Mendonça França2013-07-221-1/+1
|
* Preparing for 3.2.14.rc2 releaseRafael Mendonça França2013-07-161-1/+1
|
* Preparing for 3.2.14.rc1 releaseRafael Mendonça França2013-07-121-2/+2
|
* clear ARGV to prevent mintest autorun errors:Yves Senn2013-06-272-0/+2
| | | | | | | | | | | | | | | | | | | | | | 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.
* Backport rails/rails-perftest#2 to fix rake test:benchmarkYves Senn2013-06-272-4/+6
|
* Merge pull request #7695 from benolee/backport_cc7dd66_and_c0ba0f0Rafael Mendonça França2013-05-124-0/+27
|\ | | | | | | | | | | | | backport runner fixes to 3-2-stable Conflicts: railties/CHANGELOG.md
| * backport runner fixes to 3-2-stablekennyj2012-12-164-0/+27
| | | | | | | | | | | | | | 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.
* | Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-masterRafael Mendonça França2013-05-041-0/+2
| | | | | | | | | | | | | | | | | | | | Fixes Scaffold generator with --assets=false Conflicts: railties/CHANGELOG.md Conflicts: railties/CHANGELOG.md railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
* | Use secure source in generated Gemfile for creating new plugin. Closes #10245Prathamesh Sonpatki2013-04-171-1/+1
| |
* | Change @env_config to @app_env_configEvan Phoenix2013-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moral of the story: One must be careful about lazily initializing instance variables when subclassing. I would like to draw your attention to https://github.com/rails/rails/issues/4652 where the reader will see that there appears to be some kind of initialization issue in rails. The source of this issue is that: 1) Engine#env_config contains "@env_config ||= ..." 2) Application#env_config contains "@env_config ||= ..." 3) Threads are in the picture 4) Thread A calls Application#env_config, which super's to Engine#env_config 5) After Engine#env_config returns but before Application#env_config sets @env_config again, Thread B begins running 6) Thread B calls Application#env_config 7) Thread B finds @env_config to contain a value (the one set by Engine#env_config) and returns it 8) Thread B blows up because key set by Application#env_config are there. 9) People report bugs with puma, thin, rainbows, webrick, etc 10) Evan becomes tired of seeing these bugs 11) Evan pours himself a stiff drink, puts on Top Gear(tm), and begins debugging 12) Evan finds the source of the bug 13) Evan authors a PR 14) RIGHT NOW. The bug is fixed by simply using a different ivar name in the methods. Alternately, Engine#env_config could just return a new Hash each time, not memoizing into @env_config. I bid you adieu.
* | bumping to 3.2.13Aaron Patterson2013-03-181-1/+1
| |
* | bumping to rc2Aaron Patterson2013-03-061-1/+1
| |
* | Preparing for 3.2.13.rc1 releaseSteve Klabnik2013-02-271-2/+2
| |
* | `name` should be public.Aaron Patterson2013-02-241-12/+12
| |
* | Merge branch '3-2-sec' into 3-2-stableAaron Patterson2013-02-111-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: bumping version remove ruby-prof Fix issue with attr_protected where malformed input could circumvent protection fixing call to columns hash. run the damn tests when you backport! Bump rack dependency to 1.4.5 Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric Conflicts: Gemfile activerecord/CHANGELOG.md
| * | bumping versionAaron Patterson2013-02-101-1/+1
| | |
* | | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2013-01-081-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: bumping version CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu Avoid Rack security warning no secret provided Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md
| * | bumping versionAaron Patterson2013-01-081-1/+1
| | |
* | | update directory tree in the generated READMEAkira Matsuda2013-01-041-8/+8
| | | | | | | | | | | | [ci skip]
* | | Merge tag 'v3.2.10' into 3-2-stableMiguel2013-01-031-1/+1
|\| | | | | | | | | | | Latest released tag was not fully merged into the stable branch (missed version bumping)
| * | bumping version to 3.2.10Aaron Patterson2012-12-231-1/+1
| | |
* | | backport #8616, quote column names in generated fixture filesYves Senn2012-12-262-2/+14
| |/ |/| | | | | | | | | | | | | | | 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
* | backport #8262, require bundler groups to include rake-tasks in enginesYves Senn2012-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If you generate a full engine, this will include rake tasks from your gem under the `app` namespace. For example if you have a dependency on `rspec-rails` in your engine's `gemspec`. You will get the task `app:spec` Closes #8229 Conflicts: railties/CHANGELOG.md
* | backport #8139, `plugin new` adds dummy app tasks when necessary. …Yves Senn2012-11-152-2/+6
| | | | | | | | | | | | | | | | | | | | | | The `plugin new` generator always adds the dummy app rake tasks, when a dummy app was created. Closes #8224 Conflicts: railties/CHANGELOG.md
* | Fixes issue #6251David Padilla2012-11-151-1/+1
|/ | | | | | | Plugin generator crashes when using the --dummy-path option Code was assuming the application name in `config/application.rb` was module Dummy.
* Bump to 3.2.9Santiago Pastorino2012-11-121-1/+1
|
* Bump up to 3.2.9.rc3Santiago Pastorino2012-11-091-1/+1
|
* Revert "Respect children paths filter settings"Santiago Pastorino2012-11-091-11/+6
| | | | | This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe. Closes #8146
* Bump to 3.2.9.rc2Santiago Pastorino2012-11-011-1/+1
|
* Bump to 3.2.9.rc1Santiago Pastorino2012-10-291-2/+2
|
* Revert "Deprecate Paths::Path#children which is unused now"Rafael Mendonça França2012-10-291-1/+0
| | | | | | | This reverts commit f7de647f2cd099ecf6434fa4a0db1ec297f1c32d. We can't deprecate things in stable branches. I didn't not realized that the pull request was for 3-2-stable
* Deprecate Paths::Path#children which is unused nowElia Schito2012-10-291-0/+1
|
* Respect children paths filter settingsElia Schito2012-10-281-6/+11
| | | | E.g. don't eager-load app/assets even if app/* has the eager_load flag set.
* Require ActionController::Railtie in the default middleware stack.Rafael Mendonça França2012-10-181-0/+2
| | | | | This will make possible to do a frameworkless initialization since the the default middleware stack is self contained.
* Backport 1a7049906ee6735bae058e9985a3806d08d9746bJeremy Kemper2012-10-061-3/+6
| | | | | | | | | | | | | Tag the blank log line between dev requests so it's easier to filter out entire requests with grep -v without leaving a stray newline behind. Example: # Tag asset requests so it's easy to filter them from dev logs config.log_tags = [ -> request { :assets if request.path.starts_with?(config.assets.prefix) }, -> request { request.uuid } ] # Watch the logs, ignoring asset requests $ tail -100f log/development.log | grep -v assets
* Update supported ruby versions error message in ruby_version_check.rblihan2012-10-031-2/+2
|
* Merge pull request #6450 from iHiD/resource_generator_routes_masterRafael Mendonça França2012-10-011-4/+41
| | | | | | | | 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)
* Tune up Rails::Rack::Logger. Only put space between requests in development ↵Jeremy Kemper2012-09-271-14/+23
| | | | | | | logs. Conflicts: railties/test/application/rack/logger_test.rb
* Log newlines separately to ensure the 'Started GET ...' line has a tag on ↵Jeremy Kemper2012-09-271-1/+2
| | | | the same line
* Only apply log tags if the logger supports itJeremy Kemper2012-09-271-1/+1
|
* We need to have 1-0-stable for joureny gem in edgeArun Agrawal2012-08-241-2/+2
| | | | | Problem : Edge rails can't bundle Fixes #7437
* Bump to 3.2.8Santiago Pastorino2012-08-091-1/+1
|
* Bump to 3.2.8.rc2Santiago Pastorino2012-08-031-1/+1
|
* Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` atRafael Mendonça França2012-08-021-1/+1
| | | | | | | the ERB scaffold generator. We are trying to teach the data attributes as best practices and `:confirm` will be deprecated in 4.0.
* Bump to 3.2.8.rc1Santiago Pastorino2012-08-011-2/+2
|
* Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` ↵Rafael Mendonça França2012-08-011-1/+1
| | | | | | | | | | | option" Revert "Deprecate `:disable_with` in favor of `'data-disable-with'` option for `button_to` and `submit_tag` helpers." This reverts commit fc092a9cba5fceec38358072e50e09250cf58840. This reverts commit e9051e20aeb2c666db06b6217954737665878db7. This reverts commit d47d6e7eda3aa3e6aa28d0c17ac6801234bb97d1. This reverts commit 21141e777bdce8534e3755c8de7268324b3d8714.
* Merge pull request #7070 from jmazzi/3-2-stableRafael Mendonça França2012-08-011-3/+6
|\ | | | | Update documentation for Rails::Application#env_config
| * Update documentation for Rails::Application#env_configJustin Mazzi2012-07-161-3/+6
| |