aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch '3-2-stable' into 3-2-secmergeAaron Patterson2013-01-025-271/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-stable: fix block.arity raise nil error when not given a block to "content_tag_for" removes the Ajax on Rails early draft Revert "Merge pull request #8665 from senny/8661_should_not_append_charset_if_already_present" backport #8662, charset should not be appended for `head` responses Revert "Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options." Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options. backport #8616, quote column names in generated fixture files
| * | | removes the Ajax on Rails early draftXavier Noria2012-12-311-267/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a few attempts at writing this guide, but we never passed from the work in progress stage. In spite of not being included in the table of contents, this draft was still indexed by bots and showed up in searches. Steve Klabnik has written "Working with JavaScript in Rails" which is going to be released with Rails 4. So better get rid of this altogether.
| * | | backport #8616, quote column names in generated fixture filesYves Senn2012-12-264-4/+40
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2012-12-231-0/+4
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: CVE-2012-5664 options hashes should only be extracted if there are extra parameters updating changelog updating the changelogs updating the changelog for the CVE Add release date of Rails 3.2.9 to documentation Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md activemodel/CHANGELOG.md activerecord/CHANGELOG.md activeresource/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md
| * updating the changelogsAaron Patterson2012-12-231-0/+2
| |
| * Add release date of Rails 3.2.9 to documentationclaudiob2012-12-231-1/+1
| | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md
* | Don't use 1.9 hash syntax on 3-2-stableAndrew White2012-12-141-6/+6
| |
* | Clear url helper methods when routes are reloadedAndrew White2012-12-141-0/+71
| | | | | | | | | | | | | | | | 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.
* | Allow users to choose the timestamp format in the cache keyRafael Mendonça França2012-12-101-0/+2
| | | | | | | | | | | | This can be done using the class attribute cache_timestamp_format Closes #8195
* | Merge pull request #8280 from asanghi/fix_guide_field_with_error_procRafael Mendonça França2012-11-201-2/+6
| | | | | | | | | | | | fix guide with field_with_error proc example [ci skip]
* | backport #8262, require bundler groups to include rake-tasks in enginesYves Senn2012-11-192-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Remove the git option from ruby-prof gem pointing to wycats repo.Carlos Antonio da Silva2012-11-161-1/+1
| | | | | | | | | | | | | | According to him, at one point his fork was the one that had the call stack printer, and it's in the main repo now. [ci skip]
* | backport #8139, `plugin new` adds dummy app tasks when necessary. …Yves Senn2012-11-154-2/+17
| | | | | | | | | | | | | | | | | | | | | | 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.
* | Update mocha version to 0.13.0 and change requiresCarlos Antonio da Silva2012-11-133-3/+4
| |
* | Add release date of Rails 3.2.9 to documentationclaudiob2012-11-121-1/+1
| |
* | Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-121-1/+1
|\|
| * Bump to 3.2.9Santiago Pastorino2012-11-121-1/+1
| |
| * Revert "Add test case to assets eager load"Santiago Pastorino2012-11-091-3/+0
| | | | | | | | This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5.
* | Revert "Add test case to assets eager load"Santiago Pastorino2012-11-091-3/+0
| | | | | | | | This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5.
* | Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-091-1/+1
|\|
| * Bump up to 3.2.9.rc3Santiago Pastorino2012-11-091-1/+1
| |
| * Revert "Respect children paths filter settings"Santiago Pastorino2012-11-092-13/+6
| | | | | | | | | | This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe. Closes #8146
* | Revert "Respect children paths filter settings"Santiago Pastorino2012-11-092-13/+6
| | | | | | | | | | This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe. Closes #8146
* | Merge pull request #8027 from daenney/masterXavier Noria2012-11-081-1/+3
|/ | | | | | | | Atomic.rb assumes it may chown/chmod a file but doesn't handle the EPERM error. Conflicts: activesupport/CHANGELOG.md guides/source/active_support_core_extensions.md
* Bump to 3.2.9.rc2Santiago Pastorino2012-11-011-1/+1
|
* Merge pull request #8009 from graceliu/3-2-fix_database_url_supportRafael Mendonça França2012-10-292-0/+230
|\ | | | | | | fixed support for DATABASE_URL for rake db tasks
| * fixed support for DATABASE_URL for rake db tasksGrace Liu2012-10-292-0/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | 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-282-6/+13
| | | | E.g. don't eager-load app/assets even if app/* has the eager_load flag set.
* Add test case to assets eager loadRafael Mendonça França2012-10-271-0/+3
|
* 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-032-2/+6
|
* Merge pull request #6450 from iHiD/resource_generator_routes_masterRafael Mendonça França2012-10-013-7/+116
| | | | | | | | 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)
* Asset manifest includes aliases for foo.js -> foo/index.js and vice versa. ↵Jeremy Kemper2012-09-301-1/+16
| | | | Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
* Fix reference to code sample in Getting Started.Steve Klabnik2012-09-301-1/+1
| | | | Fixes #7799.
* Hashrocket for 1.8 supportJeremy Kemper2012-09-281-2/+2
|
* Tune up Rails::Rack::Logger. Only put space between requests in development ↵Jeremy Kemper2012-09-272-20/+29
| | | | | | | 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
|
* Explictly set the assets digest option to falseRafael Mendonça França2012-09-201-2/+5
|
* Add upgrading note to 3.1 release notes.Steve Klabnik2012-09-181-0/+122
| | | | See #7685.
* CHANGELOGs are now per branchXavier Noria2012-08-281-2384/+1
| | | | Check 810a50d for the rationale.
* We need to have 1-0-stable for joureny gem in edgeArun Agrawal2012-08-242-3/+4
| | | | | Problem : Edge rails can't bundle Fixes #7437
* [guides] Add info about CHANGELOGs to contributing guidePiotr Sarnacki2012-08-111-0/+25
|
* Merge branch '3-2-8' into 3-2-stableSantiago Pastorino2012-08-092-2/+2
|\
| * Bump to 3.2.8Santiago Pastorino2012-08-091-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 17:48:19 +0000