aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | The primary key is always initialized in the @attributes hash to nil (unlessAaron Patterson2012-01-255-7/+12
|/ | | | another value has been specified).
* Merge pull request #4676 from lest/patch-1José Valim2012-01-252-12/+22
|\ | | | | allow to pass multiple sources to audio/video tags without using array
| * allow to pass multiple sources to audio/video tags without using arraySergey Nartimov2012-01-252-12/+22
|/
* Merge pull request #4529 from ask4prasath/refactorVijay Dev2012-01-251-8/+10
|\ | | | | Refactored class methods on address render test
| * Refactored class methods on address render testprasath2012-01-191-8/+10
| |
* | Merge pull request #4645 from brainopia/deprecate_datetime_local_offsetAaron Patterson2012-01-254-17/+22
|\ \ | | | | | | Deprecate DateTime.local_offset
| * | Deprecate DateTime.local_offsetbrainopia2012-01-254-17/+22
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-01-2612-31/+64
|\ \
| * | Revert "Added Apache configuration for dynamic gzip content"Vijay Dev2012-01-251-24/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fce92fd8a7e407b034d189a652af81a06ac98730. Reason: We want any config that goes into the guides to be 100% right and I'm not entirely sure that this one is it. We already had a similar config that was removed in https://github.com/rails/rails/commit/b1c20e37eccdfab7bb94d34f249c5e49256b9980
| * | minor text change [ci skip]Vijay Dev2012-01-251-1/+1
| | |
| * | Fix translate_error reference for Error#add documentationJonathan del Strother2012-01-251-1/+1
| | |
| * | Fix callbacks order for destroying an object in validations guideCarlos Antonio da Silva2012-01-251-2/+4
| | | | | | | | | | | | | | | Also add around save to creating/updating callbacks order, and fix save example with no validation
| * | Improve field error proc example in validations guideCarlos Antonio da Silva2012-01-251-7/+2
| | |
| * | Change ActiveRecord::Errors to ActiveModel::Errors in guidesCarlos Antonio da Silva2012-01-256-14/+14
| | | | | | | | | | | | | | | | | | | | | Use ActiveModel::Errors in inflection example docs as well. Also fixes wrong information and link to locale file related to Errors#full_messages in I18n guide.
| * | Fix custom validation methods section in AR validations and callbacks guideCarlos Antonio da Silva2012-01-251-2/+14
| | | | | | | | | | | | | | | | | | The methods validate_on_create and validate_on_update are not available anymore in Rails, this removes them from the guide and adds an example on how to use validate with the :on option.
| * | remove extra 'the'Rohit Arondekar2012-01-251-1/+1
| | |
| * | Added Apache configuration for dynamic gzip contentleprasmurf2012-01-231-1/+24
| | |
| * | use CamelCase convention for "tag" model nameciastek2012-01-231-1/+1
| | |
| * | example bracket errorDamian Le Nouaille2012-01-231-1/+1
| | |
| * | "will be used throughout all the views for posts." could suggest, that ↵ciastek2012-01-231-1/+1
| | | | | | | | | | | | code's modification is somehow related to posts, while it's application-wide
| * | Documented the :use_two_digit_numbers optionLennart Fridén2012-01-221-0/+24
| | |
| * | Fixed typo in 'cast'.Aleksey Gureiev2012-01-211-1/+1
| | |
* | | Merge pull request #4644 from ask4prasath/refactor_testAaron Patterson2012-01-251-4/+3
|\ \ \ | | | | | | | | Replaced unwanted method and added to accessor for getter history
| * | | Removing unwanted method and adding to accessor for getter historyprasath2012-01-251-4/+3
| | |/ | |/|
* | | Merge pull request #4646 from lest/patch-1Aaron Patterson2012-01-252-39/+30
|\ \ \ | | | | | | | | no need in separate MiniTest modules
| * | | no need in separate MiniTest modulesSergey Nartimov2012-01-242-39/+30
| | | |
* | | | Merge pull request #4658 from pwim/unicode-pathsAaron Patterson2012-01-251-0/+20
| | | | | | | | | | | | | | | | Test for unicode path support
* | | | use fetch rather than both Hash#key? and Hash#[]Aaron Patterson2012-01-251-49/+51
| | | |
* | | | Merge pull request #4524 from nashby/datetime-18-codeJosé Valim2012-01-251-15/+0
|\ \ \ \ | | | | | | | | | | remove ruby 1.8 related code
| * | | | remove ruby 1.8 related codeVasiliy Ermolovich2012-01-181-15/+0
| | | | |
* | | | | Merge pull request #4667 from carlosantoniodasilva/av-number-helperJosé Valim2012-01-252-44/+55
|\ \ \ \ \ | | | | | | | | | | | | Action View number helpers improvements
| * | | | | Do not mutate given options hash in number helpersCarlos Antonio da Silva2012-01-252-9/+32
| | | | | |
| * | | | | Refactor percentage helperCarlos Antonio da Silva2012-01-251-1/+2
| | | | | |
| * | | | | Refactor float number parsingCarlos Antonio da Silva2012-01-251-25/+9
| | | | | |
| * | | | | Improve getting translations for number helpersCarlos Antonio da Silva2012-01-251-10/+13
|/ / / / /
* | | | | Merge pull request #4661 from janko-m/masterJosé Valim2012-01-252-6/+15
|\ \ \ \ \ | | | | | | | | | | | | Modify video_tag a bit and make audio_tag able to accept multiple sources
| * | | | | Make audio_tag able to receive multiple sourcesJanko Marohnić2012-01-252-3/+12
| | | | | |
| * | | | | Make path_to_video in video_tag apply to each sourceJanko Marohnić2012-01-252-3/+3
| | | | | |
* | | | | | Merge pull request #4651 from paul/mysql-add-index-bugJosé Valim2012-01-252-2/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Handle nil in add_index :length option in MySQL
| * | | | | Handle nil in add_index :length option in MySQLPaul Sadauskas2012-01-242-2/+8
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our schema.rb is being generated with an `add_index` line similar to this: add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil} This is the same as it was on Rails 3.1.3, however, now when that schema.rb is evaluated, its generating bad SQL in MySQL: Mysql::Error: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '))' at line 1: CREATE UNIQUE INDEX `xxx` ON `foo` (`foo`(8), `bar`()) This commit adds a check for nil on the length attribute to prevent the empty parens from being output.
* | / / / Remove unused variables to avoid warningsRafael Mendonça França2012-01-241-3/+0
| |/ / / |/| | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | | Merge pull request #4606 from lest/patch-1Aaron Patterson2012-01-241-2/+0
|\ \ \ \ | | | | | | | | | | remove unnecessary AS::Concern usage
| * | | | remove unnecessary AS::Concern usageSergey Nartimov2012-01-221-2/+0
| | | | |
* | | | | deprecated AR::TestCase in favor of AS::TestCaseAaron Patterson2012-01-241-0/+4
| | | | |
* | | | | Moving AR::TestCase in to the AR tests directoryAaron Patterson2012-01-243-32/+64
| | | | |
* | | | | Merge pull request #4641 from rafaelfranca/date_select-fix-3-2José Valim2012-01-242-4/+41
| | | | | | | | | | | | | | | | | | | | date_select fixes [3-2-stable]
* | | | | Merge pull request #4514 from brainopia/update_timezone_offetsAaron Patterson2012-01-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Update time zone offset information
| * | | | | Update time zone offset informationbrainopia2012-01-181-1/+1
| | | | | |
* | | | | | Merge pull request #3775 from karevn/masterAaron Patterson2012-01-242-2/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Please pull my changes - they fix a rare problem with tests framework
| * | | | | | Fix: when using subdomains and constraints, request params were not passed ↵karevn2011-11-282-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to constraints callback