aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
| |
| * Add release date to CHANGELOGsSantiago Pastorino2012-08-091-1/+1
| |
| * Bump to 3.2.8.rc2Santiago Pastorino2012-08-031-1/+1
| |
| * html_escape should escape single quotesSantiago Pastorino2012-08-021-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
| * Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` atRafael Mendonça França2012-08-022-4/+9
| | | | | | | | | | | | | | the ERB scaffold generator. We are trying to teach the data attributes as best practices and `:confirm` will be deprecated in 4.0.
* | Fix invalid asset compile assertionsJoshua Peek2012-08-071-3/+2
| | | | | | | | Logical paths to compile should require an extension
* | make assertions easier to track downAaron Patterson2012-08-071-9/+17
| |
* | html_escape should escape single quotesSantiago Pastorino2012-08-021-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
* | Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` atRafael Mendonça França2012-08-022-4/+9
|/ | | | | | | 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.
* Add missing CHANGELOG entriesSantiago Pastorino2012-08-011-2/+6
| | | | [ci skip]
* 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
| |
* | Merge pull request #7147 from pferdefleisch/scaffold_controller_docsRafael Mendonça França2012-07-311-4/+3
| | | | | | | | Updated scaffold_controller generator docs #7146
* | Revert "Add update_columns and the suggestion of using update_columnsRafael Mendonça França2012-07-301-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of update_column" This reverts commit 9fa06c3d9811113259cb6e00a3a8454b3974add7. This reverts commit 17a64de4980683da3ca3c185205013a29a8cf88d. This reverts commit def9c85ffbdcf63e6c412b6bd4abafaa32ccdb5c, reversing changes made to 6b7d26cf3c061907aedc44f7f36776c9b36950fd. Reason: This was supposed to be released with 3.2.7 before the suggestion to use update_column. Since it was not release now is not good to suggest to use another method because it will confusing the people.
* | Backport #6995 to 3-2 stableFrancesco Rodriguez2012-07-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Update `test_help` to config properly turn natural language option. Last versions of Turn don't monkey patch MiniTest to setup the natural language option. Here is an [example](https://github.com/TwP/turn/blob/master/try/test_autorun_minitest.rb#L3). This patches the following behaviour: $ rake test:units `<top (required)>': undefined method `use_natural_language_case_names=' for MiniTest::Unit:Class (NoMethodError)
* | Merge branch '3-2-rel' into 3-2-stableAaron Patterson2012-07-262-1/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-rel: updating release date bumping to 3.2.7 updating the changelog * Do not convert digest auth strings to symbols. CVE-2012-3424 updating the version updating changelogs
| * | updating release dateAaron Patterson2012-07-261-1/+1
| | |
| * | bumping to 3.2.7Aaron Patterson2012-07-261-1/+1
| | |
| * | updating the versionAaron Patterson2012-07-231-2/+2
| | |
| * | updating changelogsAaron Patterson2012-07-231-0/+5
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 10:39:45 +0000