Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10408 from ↵ | Rafael Mendonça França | 2013-05-01 | 43 | -349/+351 |
|\ | | | | | | | | | patricksrobertson/convert_activemodel_to_new_hash_syntax Convert ActiveModel to 1.9 hash syntax. | ||||
| * | Convert ActiveModel to 1.9 hash syntax. | Patrick Robertson | 2013-05-01 | 43 | -349/+351 |
|/ | | | | | I also attempted to fix other styleguide violations such as { a: :b } over {a: :b} and foo(b: 'bar') over foo( b: 'bar' ). | ||||
* | Merge pull request #7839 from ↵ | Aaron Patterson | 2013-05-01 | 7 | -9/+70 |
|\ | | | | | | | | | chancancode/handle_aliased_attributes_in_ar_relation Handle aliased attributes in AR::Relation | ||||
| * | Handle aliased attributes in ActiveRecord::Relation. | Godfrey Chan | 2013-05-01 | 7 | -9/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using symbol keys, ActiveRecord will now translate aliased attribute names to the actual column name used in the database: With the model class Topic alias_attribute :heading, :title end The call Topic.where(heading: 'The First Topic') should yield the same result as Topic.where(title: 'The First Topic') This also applies to ActiveRecord::Relation::Calculations calls such as `Model.sum(:aliased)` and `Model.pluck(:aliased)`. This will not work with SQL fragment strings like `Model.sum('DISTINCT aliased')`. Github #7839 *Godfrey Chan* | ||||
* | | Improve docs for postgresql with uuid primary keys [ci skip] | Carlos Antonio da Silva | 2013-05-01 | 2 | -9/+7 |
| | | | | | | | | Introduced in 09ac1776abc0d3482f491f2d49f47bcb3d9a4ad7. | ||||
* | | Merge pull request #10407 from NARKOZ/encoding-constant | Carlos Antonio da Silva | 2013-05-01 | 1 | -1/+1 |
|\ \ | |/ |/| | Use constant for encoding | ||||
| * | use constant for encoding | Nihad Abbasov | 2013-05-02 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #10404 from chadmoone/fix-pg-uuid-default | Rafael Mendonça França | 2013-05-01 | 2 | -1/+61 |
|\ \ | | | | | | | Allow override of PostgreSQL UUID primary key default | ||||
| * | | allow override of uuid_generate_v4() default by passing default: nil | Chad Moone | 2013-05-01 | 2 | -1/+61 |
| |/ | | | | | | | without this, it's not possible to use UUID primary keys without uuid-ossp installed and activated | ||||
* | | Merge pull request #10405 from rubys/410-beta | Guillermo Iguaran | 2013-05-01 | 1 | -2/+2 |
|\ \ | |/ |/| | Make railties version match RAILS_VERSION | ||||
| * | Make railties version match RAILS_VERSION | Sam Ruby | 2013-05-01 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #10394 from BMorearty/remove-varargs-from-in | Guillermo Iguaran | 2013-05-01 | 3 | -31/+10 |
|\ | | | | | Remove varargs from `Object#in?` | ||||
| * | Revert the guide after removing varargs from `in?`. | Brian Morearty | 2013-05-01 | 1 | -2/+1 |
| | | |||||
| * | Revert "Object#in? also accepts multiple parameters" | Brian Morearty | 2013-05-01 | 2 | -29/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ebf69ab1636df74c76332c53bcd3d8494fb91b45. `in?` must not take multiple parameters because its behavior would be ambiguous: # Test if "B" is included in a list of names with `"B".in?(*names)`: names = ["BMorearty"] "B".in?(*names) # => true names = ["BMorearty","rubyduo"] "B".in?(*names) # => false Conflicts: activesupport/lib/active_support/core_ext/object/inclusion.rb activesupport/test/core_ext/object/inclusion_test.rb | ||||
* | | Fix failing AP test | Carlos Antonio da Silva | 2013-05-01 | 1 | -1/+1 |
| | | |||||
* | | Revert "Consistent use of code syntax formatting for boolean values" | Xavier Noria | 2013-05-01 | 1 | -7/+7 |
| | | | | | | | | | | | | Same rationale as previous revert. This reverts commit 887225e69b6cdd27f00cf043c4ac918ca5e18cbf. | ||||
* | | Revert "Correct formatting for remaining booleans" | Xavier Noria | 2013-05-01 | 1 | -21/+21 |
|/ | | | | | | | It is not in the contract that flags have to be singletons, the use of regular font indicates that. This reverts commit 80036f9a5341bd831d125dc684841a8433d92070. | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-05-01 | 36 | -380/+334 |
|\ | |||||
| * | copy edits [ci skip] | Vijay Dev | 2013-05-01 | 2 | -2/+2 |
| | | |||||
| * | routes.rb should teach how to use concerns | Thiago Pinto | 2013-05-01 | 1 | -0/+7 |
| | | |||||
| * | Correct formatting for remaining booleans | Jonathan Roes | 2013-04-30 | 1 | -21/+21 |
| | | |||||
| * | more naming fixes. | Yves Senn | 2013-04-30 | 5 | -7/+12 |
| | | | | | | | | | | | | | | | | * it's Action Mailer not ActionMailer * it's Action Pack not ActionPack * it's Active Support not ActiveSupport /cc @fxn | ||||
| * | it's Active Record not ActiveRecord | Yves Senn | 2013-04-30 | 8 | -8/+13 |
| | | | | | | | | /cc @fxn | ||||
| * | Consistent use of code syntax formatting for boolean values | Jonathan Roes | 2013-04-30 | 1 | -7/+7 |
| | | |||||
| * | Move 2 images to getting_started folder. All other images in getting started ↵ | Richard Owen | 2013-04-28 | 3 | -2/+2 |
| | | | | | | | | guide already in this folder. | ||||
| * | New rails welcome screen | Richard Owen | 2013-04-28 | 1 | -0/+0 |
| | | |||||
| * | Use instance variables in redirect_to | Mikhail Dieterle | 2013-04-28 | 1 | -4/+4 |
| | | |||||
| * | Add changes based on recommendations in Issue #9793 | Nick Borromeo | 2013-04-23 | 1 | -173/+65 |
| |\ | |||||
| | * | Remove calls to action: and make use of named routes for consistency. | Nick Borromeo | 2013-04-23 | 1 | -106/+35 |
| | | | |||||
| | * | Move use of named routes to beggining of the guide | Nick Borromeo | 2013-04-23 | 1 | -67/+30 |
| |/ | |||||
| * | Added missing ')' on routing_filter link | hughkelsey | 2013-04-23 | 1 | -1/+1 |
| | | |||||
| * | Update assets_pipeline with config.assets.precompile location | Zoltan Debre | 2013-04-23 | 1 | -2/+2 |
| | | | | | | rake assets:precompile will work if config.assets.precompile is in config/application.rb and not in config/environment/production.rb | ||||
| * | Remove superfluous `self.` in Action Mailer mail method documetation | Alexey Vakhov | 2013-04-23 | 1 | -3/+3 |
| | | | | | | | | | | | | Notation with `self` was sugestted at 0b05acd, when self.defaults was extlib_inheritable_accessor. But now all Action Mailer examples are without this self. It's nicer. | ||||
| * | Cosmetic fixes in AM::Base docs. Missed spaces in OpenSSL constants ↵ | Alexey Vakhov | 2013-04-23 | 1 | -2/+2 |
| | | | | | | | | | | | | enumerations. Injected at a1639ad. | ||||
| * | Mention that Dynamic finders have been deprecated in Rails 4 | Jonathan Roes | 2013-04-23 | 1 | -0/+2 |
| | | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | aditya-kapoor | 2013-04-22 | 1 | -3/+3 |
| |\ | |||||
| | * | Make AM readme example more consistent | Alexey Vakhov | 2013-04-22 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | At 4a6eba32 mail sending example was rewrited from rails 2 format to modern rails 3 approach. But passing parameter `recipient` to method Notifier#welcome was lost. Passing email as parameter makes this example more solid. | ||||
| * | | Added instructions of latest bundler install + modified the on: :save option ↵ | aditya-kapoor | 2013-04-22 | 2 | -2/+5 |
| |/ | | | | | | | description in validations | ||||
| * | corrected a typo related to on: :save option in validations | aditya-kapoor | 2013-04-22 | 1 | -1/+1 |
| | | |||||
| * | corrected a line related to on: :save option in validations | aditya-kapoor | 2013-04-22 | 1 | -0/+2 |
| | | |||||
| * | fixes typo in testing guide | Florian Thomas | 2013-04-21 | 1 | -1/+1 |
| | | |||||
| * | Updates list of assertions in testing guide | Florian Thomas | 2013-04-21 | 1 | -12/+19 |
| | | |||||
| * | Refer to 37signals blog post for alternative | Jonathan Roes | 2013-04-21 | 1 | -2/+2 |
| | | | | | | | | | | According to the rationale at https://github.com/rails/rails/pull/7833#issuecomment-9141908, we should recommend new users to follow DHH's approach outlined at http://37signals.com/svn/posts/3113-how-key-based-cache-expiration-works. This is the first step, and perhaps in the future we can write some specific recommendations out. | ||||
| * | Make guide description more concise | Fiona Tay | 2013-04-21 | 1 | -1/+1 |
| | | |||||
| * | There are now 6 request methods including PATCH | Jonathan Roes | 2013-04-19 | 1 | -1/+1 |
| | | |||||
| * | Simplify ERB example code | Jonathan Roes | 2013-04-19 | 1 | -2/+2 |
| | | |||||
| * | MiniTest::Unit is used instead of Test::Unit | Florian Thomas | 2013-04-19 | 1 | -2/+3 |
| | | |||||
| * | rubygem -> RubyGem | Prathamesh Sonpatki | 2013-04-19 | 4 | -4/+4 |
| | | | | | | | | * Reference -> http://guides.rubygems.org/what-is-a-gem/ | ||||
| * | Grammar | Jonathan Roes | 2013-04-18 | 1 | -6/+6 |
| | | |||||
| * | Be more specific about the root directory. | Jonathan Roes | 2013-04-18 | 1 | -1/+1 |
| | |