aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ci skip] Update scaffold output and change some words.Juanito Fatas2013-09-271-3/+18
| | | | | | | | | | Scaffold output: add jbuilder, update timestamp (edge guide!) Add some file breadcrumb (comment) to help reader find files. Improve readability by adding some command outputs. Thanks for great help from @senny.
* Merge pull request #12329 from benmanns/docrailsRafael Mendonça França2013-09-231-3/+3
|\ | | | | Update references to wycats/thor to erikhuda/thor.
| * Update references to wycats/thor to erikhuda/thor.Benjamin Manns2013-09-231-3/+3
|/
* Merge pull request #12325 from tjschuck/bcrypt_version_bumpRafael Mendonça França2013-09-234-6/+6
|\ | | | | Bump bcrypt-ruby version to support Ruby 2.0 on Windows
| * bcrypt-ruby v3.1.2 supports Ruby 2.0 on WindowsT.J. Schuck2013-09-234-6/+6
| |
* | Fix the model name in the association basics guidesRafael Mendonça França2013-09-231-1/+4
| | | | | | [ci skip]
* | Merge pull request #12315 from gaurish/superRafael Mendonça França2013-09-231-26/+28
|\ \ | |/ |/| TypeError: superclass mismatch for class PostgreSQLAdapter
| * We shouldn't override PostgreSQLAdapter's superclass inheritance while ↵Gaurish Sharma2013-09-231-26/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | monkeypatching Changing Inheritance section leads to following error on JRuby TypeError: superclass mismatch for class PostgreSQLAdapter After this change, Jruby: The above error no longer appear. Tests are still failing but they do run. Progress! MRI: No change, all green(tested by running take test_test_postgresql) Thanks to Aditya Sanghi(@asanghi) for help
* | Merge pull request #10773 from wangjohn/link_and_routing_optionsRafael Mendonça França2013-09-232-2/+16
|\ \ | | | | | | | | | Adding documentation and tests to ``polymorphic_url`` and ``link_to``
| * | Adding documentation to +polymorphic_url+wangjohn2013-06-132-2/+16
| | | | | | | | | | | | | | | | | | | | | concerning the options that it inherits from +url_for+. The way that +polymorhpic_url+ is built allows it to have options like +:anchor+, +:script_name+, etc. but this is currently not documented.
* | | Merge pull request #11987 from wangjohn/schema_dumper_optionsRafael Mendonça França2013-09-231-5/+16
|\ \ \ | | | | | | | | Creating options for schema dumper.
| * | | Creating options for schema dumper.wangjohn2013-08-221-5/+16
| | | | | | | | | | | | | | | | | | | | These options make it easier to change the config from ActiveRecord::Base to use something else inside of the SchemaDumper.
* | | | Merge pull request #12070 from wangjohn/small_refactors_to_generatorsRafael Mendonça França2013-09-231-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small refactoring changes to generators. Conflicts: railties/lib/rails/generators/rails/controller/controller_generator.rb
| * | | | Small refactoring changes to generators.wangjohn2013-08-292-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Made a method name clearer (added a bang to the end to show that it mutates arguments) and extracted indentation into its own method.
* | | | | Merge pull request #12287 from bogdan/select-with-selected-optionRafael Mendonça França2013-09-233-1/+22
|\ \ \ \ \ | | | | | | | | | | | | Fix some edge cases for select with selected option
| * | | | | Fix some edge cases for AV `select` helper with `:selected` optionBogdan Gusiev2013-09-233-1/+22
|/ / / / /
* | | | | Fix the documentation method.Rafael Mendonça França2013-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is reload! in the class definition. [ci skip]
* | | | | Expand select documentation to tell about the blockRafael Mendonça França2013-09-231-0/+9
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Use ERB in the CHANGELOG [ci skip]Rafael Mendonça França2013-09-231-3/+5
| | | | |
* | | | | Merge pull request #11055 from bogdan/select-with-blockRafael Mendonça França2013-09-234-5/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Ability to pass block to select form builder helper
| * | | | | Ability to pass block to AV#select helperBogdan Gusiev2013-09-234-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: = select(report, "campaign_ids") do - available_campaigns.each do |c| %option{:data => {:tags => c.tags.to_json}, :value => c.id}= c.name
* | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 09:40:46 +0000