aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | No need to abbreviate ActiveModelRafael Mendonça França2013-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Document reset_changes since it is part of public APIRafael Mendonça França2013-09-231-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #10816 from bogdan/less-dirty-dirtyRafael Mendonça França2013-09-237-26/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make AM::Dirty less dirty to plugin into AR or other library
* | | | | | | | Merge pull request #12321 from bogdan/time-with-zone-succRafael Mendonça França2013-09-231-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Changelog entry for pr #11474
| * | | | | | | Changelog entry for pr #11474Bogdan Gusiev2013-09-231-0/+5
|/ / / / / / /
* | | | | | | Merge pull request #12314 from JuanitoFatas/migrationsYves Senn2013-09-231-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Add `null` type modifier in migrations.md.
| * | | | | | | [ci skip] Add a type modifier in migrations.md.Juanito Fatas2013-09-221-0/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #11060 from schneems/schneems/multi-stdout-logging-masterGuillermo Iguaran2013-09-223-2/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Only output Server logs in Development
| * | | | | | | Only output Server logs in Developmentschneems2013-09-223-2/+18
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now when you start a server via `rails s`, the logger gets extended so that it logs to the file system and also to stdout. This extension behavior is not "intelligent" and if the default logger is already set to output to stdout, then the contents will be received twice. To capture logs in accordance with http://www.12factor.net/logs some platforms require the logs to be sent to standard out. If a logger is set to stdout, and the server is started using `rails server` instead of another method (i.e. `thin start` etc.) then the app will produce double logs. This PR fixes the issue by only extending the logger to standard out in the development environment. So that in production you don't get double logs like this: ``` ActionView::Template::Error (wrong number of arguments (5 for 4)): 1: <% lang_index = 0 %> 2: <div class="row"> 3: <ul class="nav nav-tabs nav-stacked span2" data-tabs="tabs" id="repo-tabs"> 4: <% repos.group_by(&:language).each do |lang, repos| %> 5: <% unless lang == nil %> 6: <li><a href="#<%= "#{lang.parameterize}#{lang.hash}" %>" data-toggle="tab"><%= lang %></a></li> 7: <% end -%> app/views/shared/_repos.html.erb:4:in `_app_views_shared__repos_html_erb___1685450633638247395_70300668607000' app/views/pages/index.html.erb:13:in `_app_views_pages_index_html_erb__2084723628308867770_70300687584880' ActionView::Template::Error (wrong number of arguments (5 for 4)): 1: <% lang_index = 0 %> 2: <div class="row"> 3: <ul class="nav nav-tabs nav-stacked span2" data-tabs="tabs" id="repo-tabs"> 4: <% repos.group_by(&:language).each do |lang, repos| %> 5: <% unless lang == nil %> 6: <li><a href="#<%= "#{lang.parameterize}#{lang.hash}" %>" data-toggle="tab"><%= lang %></a></li> 7: <% end -%> app/views/shared/_repos.html.erb:4:in `_app_views_shared__repos_html_erb___1685450633638247395_70300668607000' app/views/pages/index.html.erb:13:in `_app_views_pages_index_html_erb__2084723628308867770_70300687584880' ``` ATP Railties. Opened against master in favor of #10999
* | | | | | | Merge pull request #9155 from bogdan/route-formatterAndrew White2013-09-221-23/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Rewrite Journey::Visitors::Formatter for performance
| * | | | | | | Rewrite journey routes formatter for performanceBogdan Gusiev2013-08-281-23/+23
| | | | | | | |
* | | | | | | | Merge pull request #11474 from bogdan/time-with-zone-succAndrew White2013-09-223-0/+47
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Prevent server blow up when iterating over TimeWithZone Range
| * | | | | | | | Disable ability to iterate over a Range of TimeWithZoneBogdan Gusiev2013-07-193-0/+47
| | | | | | | | |
* | | | | | | | | Merge pull request #12317 from nashby/collection-label-namespaceRafael Mendonça França2013-09-224-1/+43
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | handle `:namespace` form option in collection labels
| * | | | | | | | | handle `:namespace` form option in collection labelsVasiliy Ermolovich2013-09-224-1/+43
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #11382 from kennyj/fix_10751-2Rafael Mendonça França2013-09-223-3/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dump UUID default functions to schema.rb [2nd version]. Fixes #10751. Conflicts: activerecord/CHANGELOG.md
| * | | | | | | | | Migration dump UUID default functions to schema.rb. Fixes #10751.kennyj2013-07-103-3/+12
| | | | | | | | | |
| * | | | | | | | | Fix typo.kennyj2013-07-101-1/+1
| | | | | | | | | |
* | | | | | | | | | Give the credits [ci skip]Rafael Mendonça França2013-09-221-0/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #10500 from kennyj/fix_10450Rafael Mendonça França2013-09-223-3/+50
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug in when using has_many association with :inverse_of option and UUID primary key. Conflicts: activerecord/CHANGELOG.md
| * | | | | | | | | | Fixed a bug in when using has_many association with :inverse_of option and ↵kennyj2013-05-083-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UUID primary key.
* | | | | | | | | | | Merge pull request #12281 from kennyj/add_doc_about_12276Rafael Mendonça França2013-09-221-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Add some comment about downcase url encoded string.
| * | | | | | | | | | | [ci skip] Add some comment about downcase url encoded string.kennyj2013-09-221-0/+2
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #12316 from JuanitoFatas/enginesRafael Mendonça França2013-09-221-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | [ci skip] Add missing migrate step in generating comment resource section.
| * | | | | | | | | | [ci skip] Add missing migrate step in generating comment resource section.Juanito Fatas2013-09-221-1/+5
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #12311 from kennyj/fix_typo_about_uuidRafael Mendonça França2013-09-211-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix typo. This test isn't executed even in the postgresql.
| * | | | | | | | | | Fix typo. This test isn't executed in even postgresql.kennyj2013-09-221-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Add back options argument in the ActiveRecord::Base.initialize methodRafael Mendonça França2013-09-211-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make easier to hook protected_attributes gem in our code without making that gem fragile to change in Rails code base. Closes #12243
* | | | | | | | | | Merge pull request #12307 from douglascalhoun/patch-1Vijay Dev2013-09-211-2/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Removes (redundant?) sentence fragment in intro text
| * | | | | | | | | | Removes redundant into textdouglascalhoun2013-09-211-2/+0
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | Looks like a remnant sentence fragment from the 3.2 guide.
* | | | | | | | | | Merge pull request #12310 from JuanitoFatas/fix-a-typoVijay Dev2013-09-211-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | [ci skip] Fix a typo in Engines.md.
| * | | | | | | | | [ci skip] Fix a typo in Engines.md.Juanito Fatas2013-09-221-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #12232 from claudiob/delete-unused-helper-fixturesSantiago Pastorino2013-09-204-16/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unused AV helper fixtures from e10a2531
| * | | | | | | | | Remove unused AV helper fixtures from e10a2531claudiob2013-09-144-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several fixtures for helpers are removed. They were introduced in ActionView by @strzalek but never referenced in any test.
* | | | | | | | | | Merge pull request #12301 from Gazler/guide_3_0_release_notes_broken_linkRafael Mendonça França2013-09-201-2/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation Fix: Remove broken link on rails 3 guide Closes #12300
| * | | | | | | | | | Fix: Remove broken link on rails 3 guideGary Rennie2013-09-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As raised in https://github.com/rails/rails/issues/12300 [ci skip]
* | | | | | | | | | | Merge pull request #11452 from dasch/dasch/details-in-digestor-cache-keyJosé Valim2013-09-203-2/+39
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bust the template digest cache key when details are changed
| * | | | | | | | | | | Bust the template digest cache key when details are changedDaniel Schierbeck2013-09-193-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the lookup details will influence which template is resolved, they need to be included in the cache key -- otherwise two different templates may erroneously share the same digest value.
* | | | | | | | | | | | Merge pull request #12285 from dasch/dasch/allow-attaching-up-frontJosé Valim2013-09-203-2/+92
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Allow attaching to AS::Notifications namespace up front
| * | | | | | | | | | | | Allow attaching to AS::Notifications namespace up frontDaniel Schierbeck2013-09-203-2/+92
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, you were required to attach *after* adding the methods to the class, since the attachment process needed the methods to be present. With this change, any new method will also be attached to the configured namespace.
* | | | | | | | | | | | Merge pull request #12299 from hitendrasingh/code_refactorJosé Valim2013-09-203-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | DRYing up method_missing code; Initializing Codepoint object with default values
| * | | | | | | | | | | Initializing Codepoint object with default valuesHitendra Singh2013-09-202-6/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Drying up method_missing codeHitendra Singh2013-09-201-2/+1
| | | | | | | | | | | |
* | | | | | | | | | | | mention controller test base class in testing guide. [ci skip]Yves Senn2013-09-201-4/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #12295 from gaurish/patch-2Guillermo Iguaran2013-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow failures in jruby-head
| * | | | | | | | | | | Allow failures in jruby-headGaurish Sharma2013-09-201-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #12294 from gaurish/patch-1Guillermo Iguaran2013-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Run Tests against JRuby master
| * | | | | | | | | | | Run Tests against JRuby masterGaurish Sharma2013-09-201-1/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many of the failing tests in rails test suite fail because of missing encoding support, example #11739 And according to recent announcement, lot of encoding issues have been fixed in current master. http://ruby.11.x6.nabble.com/Big-encoding-patches-landed-on-master-td4993719.html So lets test against JRuby master & incase there are still bugs. it would be easier to report them to JRuby.
* | | | | | | | | | | Merge pull request #10362 from derekprior/dp-fix-assert-redirect-toAndrew White2013-09-194-34/+53
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect assert_redirected_to failure message
| * | | | | | | | | | | Fix regex used to find URI schemes in redirect_toDerek Prior2013-09-192-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous regex was allowing `_` in the URI scheme, which is not allowed by RFC 3986. This change brings the regex in line with the RFC.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 03:53:15 +0000