Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4679 from lest/patch-1 | José Valim | 2012-01-25 | 2 | -27/+37 |
|\ | | | | | AssetTagHelper improvements | ||||
| * | reuse common video/audio tags code and do not modify options | Sergey Nartimov | 2012-01-26 | 2 | -25/+29 |
| | | |||||
| * | do not modify options in image_tag | Sergey Nartimov | 2012-01-26 | 2 | -2/+8 |
| | | |||||
* | | The primary key is always initialized in the @attributes hash to nil (unless | Aaron Patterson | 2012-01-25 | 5 | -7/+12 |
|/ | | | | another value has been specified). | ||||
* | Merge pull request #4676 from lest/patch-1 | José Valim | 2012-01-25 | 2 | -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 array | Sergey Nartimov | 2012-01-25 | 2 | -12/+22 |
|/ | |||||
* | Merge pull request #4529 from ask4prasath/refactor | Vijay Dev | 2012-01-25 | 1 | -8/+10 |
|\ | | | | | Refactored class methods on address render test | ||||
| * | Refactored class methods on address render test | prasath | 2012-01-19 | 1 | -8/+10 |
| | | |||||
* | | Merge pull request #4645 from brainopia/deprecate_datetime_local_offset | Aaron Patterson | 2012-01-25 | 4 | -17/+22 |
|\ \ | | | | | | | Deprecate DateTime.local_offset | ||||
| * | | Deprecate DateTime.local_offset | brainopia | 2012-01-25 | 4 | -17/+22 |
|/ / | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-01-26 | 12 | -31/+64 |
|\ \ | |||||
| * | | Revert "Added Apache configuration for dynamic gzip content" | Vijay Dev | 2012-01-25 | 1 | -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 Dev | 2012-01-25 | 1 | -1/+1 |
| | | | |||||
| * | | Fix translate_error reference for Error#add documentation | Jonathan del Strother | 2012-01-25 | 1 | -1/+1 |
| | | | |||||
| * | | Fix callbacks order for destroying an object in validations guide | Carlos Antonio da Silva | 2012-01-25 | 1 | -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 guide | Carlos Antonio da Silva | 2012-01-25 | 1 | -7/+2 |
| | | | |||||
| * | | Change ActiveRecord::Errors to ActiveModel::Errors in guides | Carlos Antonio da Silva | 2012-01-25 | 6 | -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 guide | Carlos Antonio da Silva | 2012-01-25 | 1 | -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 Arondekar | 2012-01-25 | 1 | -1/+1 |
| | | | |||||
| * | | Added Apache configuration for dynamic gzip content | leprasmurf | 2012-01-23 | 1 | -1/+24 |
| | | | |||||
| * | | use CamelCase convention for "tag" model name | ciastek | 2012-01-23 | 1 | -1/+1 |
| | | | |||||
| * | | example bracket error | Damian Le Nouaille | 2012-01-23 | 1 | -1/+1 |
| | | | |||||
| * | | "will be used throughout all the views for posts." could suggest, that ↵ | ciastek | 2012-01-23 | 1 | -1/+1 |
| | | | | | | | | | | | | code's modification is somehow related to posts, while it's application-wide | ||||
| * | | Documented the :use_two_digit_numbers option | Lennart Fridén | 2012-01-22 | 1 | -0/+24 |
| | | | |||||
| * | | Fixed typo in 'cast'. | Aleksey Gureiev | 2012-01-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #4644 from ask4prasath/refactor_test | Aaron Patterson | 2012-01-25 | 1 | -4/+3 |
|\ \ \ | | | | | | | | | Replaced unwanted method and added to accessor for getter history | ||||
| * | | | Removing unwanted method and adding to accessor for getter history | prasath | 2012-01-25 | 1 | -4/+3 |
| | |/ | |/| | |||||
* | | | Merge pull request #4646 from lest/patch-1 | Aaron Patterson | 2012-01-25 | 2 | -39/+30 |
|\ \ \ | | | | | | | | | no need in separate MiniTest modules | ||||
| * | | | no need in separate MiniTest modules | Sergey Nartimov | 2012-01-24 | 2 | -39/+30 |
| | | | | |||||
* | | | | Merge pull request #4658 from pwim/unicode-paths | Aaron Patterson | 2012-01-25 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | Test for unicode path support | ||||
* | | | | use fetch rather than both Hash#key? and Hash#[] | Aaron Patterson | 2012-01-25 | 1 | -49/+51 |
| | | | | |||||
* | | | | Merge pull request #4524 from nashby/datetime-18-code | José Valim | 2012-01-25 | 1 | -15/+0 |
|\ \ \ \ | | | | | | | | | | | remove ruby 1.8 related code | ||||
| * | | | | remove ruby 1.8 related code | Vasiliy Ermolovich | 2012-01-18 | 1 | -15/+0 |
| | | | | | |||||
* | | | | | Merge pull request #4667 from carlosantoniodasilva/av-number-helper | José Valim | 2012-01-25 | 2 | -44/+55 |
|\ \ \ \ \ | | | | | | | | | | | | | Action View number helpers improvements | ||||
| * | | | | | Do not mutate given options hash in number helpers | Carlos Antonio da Silva | 2012-01-25 | 2 | -9/+32 |
| | | | | | | |||||
| * | | | | | Refactor percentage helper | Carlos Antonio da Silva | 2012-01-25 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Refactor float number parsing | Carlos Antonio da Silva | 2012-01-25 | 1 | -25/+9 |
| | | | | | | |||||
| * | | | | | Improve getting translations for number helpers | Carlos Antonio da Silva | 2012-01-25 | 1 | -10/+13 |
|/ / / / / | |||||
* | | | | | Merge pull request #4661 from janko-m/master | José Valim | 2012-01-25 | 2 | -6/+15 |
|\ \ \ \ \ | | | | | | | | | | | | | Modify video_tag a bit and make audio_tag able to accept multiple sources | ||||
| * | | | | | Make audio_tag able to receive multiple sources | Janko Marohnić | 2012-01-25 | 2 | -3/+12 |
| | | | | | | |||||
| * | | | | | Make path_to_video in video_tag apply to each source | Janko Marohnić | 2012-01-25 | 2 | -3/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #4651 from paul/mysql-add-index-bug | José Valim | 2012-01-25 | 2 | -2/+8 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Handle nil in add_index :length option in MySQL | ||||
| * | | | | | Handle nil in add_index :length option in MySQL | Paul Sadauskas | 2012-01-24 | 2 | -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 warnings | Rafael Mendonça França | 2012-01-24 | 1 | -3/+0 |
| |/ / / |/| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | | Merge pull request #4606 from lest/patch-1 | Aaron Patterson | 2012-01-24 | 1 | -2/+0 |
|\ \ \ \ | | | | | | | | | | | remove unnecessary AS::Concern usage | ||||
| * | | | | remove unnecessary AS::Concern usage | Sergey Nartimov | 2012-01-22 | 1 | -2/+0 |
| | | | | | |||||
* | | | | | deprecated AR::TestCase in favor of AS::TestCase | Aaron Patterson | 2012-01-24 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Moving AR::TestCase in to the AR tests directory | Aaron Patterson | 2012-01-24 | 3 | -32/+64 |
| | | | | | |||||
* | | | | | Merge pull request #4641 from rafaelfranca/date_select-fix-3-2 | José Valim | 2012-01-24 | 2 | -4/+41 |
| | | | | | | | | | | | | | | | | | | | | date_select fixes [3-2-stable] | ||||
* | | | | | Merge pull request #4514 from brainopia/update_timezone_offets | Aaron Patterson | 2012-01-24 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Update time zone offset information |