aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * mispelling asset_tag_helperAngelo Capilleri2012-05-131-1/+1
| | | |
| | * | Correct code wrapping around content of welcome/index.html.erbRyan Bigg2012-05-141-2/+2
| | | |
| | * | Wrap 'Missing template posts/new' error message in a blockquote for better ↵Ryan Bigg2012-05-141-2/+2
| | | | | | | | | | | | | | | | formatting
| | * | Rails actually has one root route definedRyan Bigg2012-05-141-1/+1
| | | |
| | * | Separate CR out in CRUD explanation, explain each letter one at a timeRyan Bigg2012-05-141-1/+1
| | | |
| | * | Re-enforce/re-explain what happens when you go to root route (Welcome#index) ↵Ryan Bigg2012-05-141-1/+1
| | | | | | | | | | | | | | | | better
| | * | Briefly explain static file routing in the getting started guideRyan Bigg2012-05-141-1/+1
| | |/
| | * marking self in Hash#symbolize_keys!Francesco Rodriguez2012-05-131-1/+1
| | |
| | * added example to Hash#symbolize_keysFrancesco Rodriguez2012-05-131-2/+5
| | |
| | * unnecessary 'examples' noise in Hash#assert_valid_keys docsFrancesco Rodriguez2012-05-131-1/+0
| | |
| | * added example to Hash#stringify_keysFrancesco Rodriguez2012-05-131-1/+5
| | |
| | * adding examples to Hash#deep_merge methodFrancesco Rodriguez2012-05-131-2/+7
| | |
| | * Update docs to public_send for Object#tryOscar Del Ben2012-05-131-1/+1
| | |
| | * update docs on Object#tryVasiliy Ermolovich2012-05-131-1/+1
| | |
| | * [guides] add local precompilation sectionRichard Hulse2012-05-131-1/+36
| | |
| * | Initial proof reading of getting started guideOscar Del Ben2012-05-071-19/+22
| | |
* | | Merge pull request #6318 from mpapis/masterJosé Valim2012-05-151-0/+8
|\ \ \ | | | | | | | | fix `bundle exec rails new app` not running `bundle install` properly
| * | | prevent using already loaded Gemfile for 'bundle install', fix #6314Michal Papis2012-05-151-0/+8
|/ / /
* | | Merge pull request #6317 from korny/routes-draw-backtracePiotr Sarnacki2012-05-144-3/+55
|\ \ \ | | | | | | | | add tests and external file backtrace for Routing::Mapper#draw
| * | | add tests and external file backtrace for Routing::Mapper#drawKornelius Kalnbach2012-05-154-3/+55
| | | |
* | | | Merge pull request #6186 from anydiem/fix_unconventional_pksRafael Mendonça França2012-05-142-1/+13
|\ \ \ \ | |/ / / |/| | | Set the primary key during #copy_table if necessary. Fixes [#2312]
| * | | Set the primary key during #copy_table if necessary. Fixes [#2312]Sean Scally2012-05-142-1/+13
| | | |
* | | | Use merge! instead reverse_merge! hereSantiago Pastorino2012-05-141-1/+1
| | | |
* | | | Remove `:disable_with` in favor of `'data-disable-with'` option from ↵Carlos Galdino + Rafael Mendonça França2012-05-146-57/+13
|/ / / | | | | | | | | | `submit_tag`, `button_tag` and `button_to` helpers.
* | | Merge pull request #6220 from frodsan/pass_multiple_valueRafael Mendonça França2012-05-146-18/+25
|\ \ \ | | | | | | | | Allow define_attribute_methods to pass multiple values
| * | | updating define_attribute_methods documentationFrancesco Rodriguez2012-05-144-5/+5
| | | |
| * | | allow define_attribute_methods to pass multiple valuesFrancesco Rodriguez2012-05-142-13/+20
|/ / /
* | | Remove not used date variable and another test warningCarlos Antonio da Silva2012-05-141-2/+1
| | |
* | | Remove assertion on date from humans.txt testsJosé Valim2012-05-141-1/+1
| | |
* | | Remove dates and environment variables from humans.txtJosé Valim2012-05-141-2/+0
| | |
* | | Merge pull request #6018 from lest/patch-1Carlos Antonio da Silva2012-05-143-1/+16
|\ \ \ | | | | | | | | mailer can be anonymous
| * | | mailer can be anonymousSergey Nartimov2012-05-133-1/+16
| | | | | | | | | | | | | | | | closes #5970
* | | | Since escape_html_entities_in_json was moved to 3-2-stable, make it true in ↵José Valim2012-05-142-4/+1
| | | | | | | | | | | | | | | | AS, closes #6287
* | | | MySQL doesn't allow default values for blobs.Rafael Mendonça França2012-05-131-2/+2
| | | |
* | | | Remove `:mouseover` option from `image_tag` helper.Rafael Mendonça França2012-05-133-21/+3
| | | |
* | | | Merge pull request #3237 from sakuro/data-url-schemeRafael Mendonça França2012-05-133-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Support data: url scheme Conflicts: actionpack/lib/action_view/asset_paths.rb
* | | | Copy edit [ci skip]Rafael Mendonça França2012-05-132-3/+5
| | | |
* | | | Merge pull request #5807 from Antiarchitect/store-improvementRafael Mendonça França2012-05-135-6/+55
|\ \ \ \ | | | | | | | | | | Custom coders support for ActiveRecord::Store.
| * | | | Custom coders support for ActiveRecord::Store. JSON, YAML, Marshal can be ↵Andrey Voronkov2012-05-095-6/+55
| | | | | | | | | | | | | | | | | | | | used out of the box.
* | | | | Merge pull request #4431 from lest/refactor-1-9Rafael Mendonça França2012-05-131-7/+3
|\ \ \ \ \ | | | | | | | | | | | | use const_defined? with second argument in AS::Dependencies
| * | | | | use const_defined? with second argument in AS::DependenciesSergey Nartimov2012-05-131-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | there is no need in local_const_defined? helper method
* | | | | | Remove dependency on safe_join from number helpersCarlos Antonio da Silva2012-05-132-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Introduced in 0f848dd54911f0e15c5c3aceabf09582cc6eab16.
* | | | | | Merge pull request #6305 from arunagw/ruby-prof-fixesCarlos Antonio da Silva2012-05-133-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ruby prof fixes
| * | | | | | Need to include "OutputSaftyHelper" here to preventArun Agrawal2012-05-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `number_with_delimiter': undefined method `safe_join' for #<ActiveSupport::Testing::Performance::Metrics::Objects
| * | | | | | Fixed ruby-prof changes and let's use latest ruby-prof now.Arun Agrawal2012-05-132-2/+2
| | | | | | |
* | | | | | | Merge pull request #6307 from oscardelben/refactor_app_generator_testCarlos Antonio da Silva2012-05-131-22/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactor App Generator Test
| * | | | | | | Refactor App Generator TestOscar Del Ben2012-05-131-22/+20
| |/ / / / / /
* | / / / / / Autoload ActionDispatch::Request::Session to avoid circular require.Andrew White2012-05-131-1/+2
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #6308 from nashby/blockless-stepJosé Valim2012-05-131-10/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove useless tests for Range#step
| * | | | | | remove useless tests for Range#stepVasiliy Ermolovich2012-05-131-10/+0
|/ / / / / /