aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6250 from iGEL/dont_destroy_readonly_modelsAaron Patterson2012-05-173-0/+7
|\ | | | | Don't allow to destroy readonly models
| * Don't destroy readonly modelsJohannes Barre2012-05-173-0/+7
| |
* | Make MockLogger work with blocks.Rafael Mendonça França2012-05-171-1/+1
| |
* | Merge pull request #6365 from kennyj/fix_warning_20120518Aaron Patterson2012-05-171-1/+1
|\ \ | |/ |/| Fix warning: ambiguous first argument.
| * Fix warning: ambiguous first argument.kennyj2012-05-181-1/+1
|/
* Merge pull request #6363 from markmcspadden/fix_duplicable_documentationVijay Dev2012-05-171-1/+1
|\ | | | | Fix documentation around duplicable regarding Class and Module.
| * Fix documentation around duplicable regarding Class and Module.Mark McSpadden2012-05-171-1/+1
|/
* Merge pull request #6351 from bogdan/callbacksJosé Valim2012-05-171-16/+3
|\ | | | | AS::Callbacks remove useless code, improve performance
| * AS::Callbacks remove useless code, improve performanceBogdan Gusiev2012-05-161-16/+3
| |
* | Merge pull request #6058 from ↵Jon Leighton2012-05-175-7/+51
|\ \ | | | | | | | | | | | | RStankov/relation-from-to-accept-other-relation-objects Relation#from to accept other Relation objects
| * | Relation#from to accept other Relation objectsRadoslav Stankov2012-05-175-7/+51
| | | | | | | | | | | | Record.from("(#{sub_query.to_sql})") -> Record.from(sub_query) Record.from("(#{sub_query.to_sql}) a") -> Record.from(sub_query, :a)
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-1720-223/+311
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/core.rb
| * | | fix word_wrap eg output [ci skip]Vijay Dev2012-05-171-1/+3
| | | |
| * | | copy edits assets guide [ci skip]Vijay Dev2012-05-171-1/+1
| | | |
| * | | copy edit and remove nodoc on instance_values method [ci skip]Vijay Dev2012-05-171-4/+4
| | | |
| * | | Revert "Update docs in sqlite3 adapter"Vijay Dev2012-05-171-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8d7c38b858b0190ac56998f4a4baba250eaf1e4e. Reason: Lot of the additions aren't adding value. [ci skip]
| * | | [getting started] remove two more beginningruby linksRyan Bigg2012-05-171-2/+2
| | | |
| * | | [getting started] add comma in 'First we will make a comment partial'Ryan Bigg2012-05-171-1/+1
| | | |
| * | | [getting started] remove another beginning ruby linkRyan Bigg2012-05-171-1/+1
| | | |
| * | | [getting started] briefly explain form_for with array parametersRyan Bigg2012-05-171-1/+4
| | | |
| * | | [getting started] Remove beginning ruby link in posts/showRyan Bigg2012-05-171-1/+1
| | | |
| * | | [getting started] generating routes manually was done as a learningRyan Bigg2012-05-171-3/+4
| | | | | | | | | | | | | | | | exercise, fix typos
| * | | [getting started] split up section about rake routes after 'resources' callRyan Bigg2012-05-171-1/+4
| | | |
| * | | [getting started] dialog box is not automatic, is provided through ↵Ryan Bigg2012-05-171-3/+6
| | | | | | | | | | | | | | | | jquery_ujs, which is necessary to have in application layout
| * | | [getting started] Fix index template after destroy action additionRyan Bigg2012-05-171-1/+3
| | | |
| * | | [getting started] dabase -> databaseRyan Bigg2012-05-171-1/+1
| | | |
| * | | [getting started guide] more explanation around the delete routing method:Ryan Bigg2012-05-171-7/+15
| | | |
| * | | [getting started] explain :as optionRyan Bigg2012-05-171-1/+4
| | | |
| * | | explain why we also add attr_accessible in the modelDamien Mathieu2012-05-171-1/+16
| | | |
| * | | Fix code example for word_wrap helper.Hendy Tanata2012-05-171-2/+2
| | | |
| * | | Fix some code formatting in core_ext guideMark Rushakoff2012-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] <plus> is nonstandard Textile; RailsGuides::TextileExtensions::plusplus is the method that causes multiple code-formatted `+` symbols to generate crap like <code>1 <notextile><tt>+</tt></notextile> 2 ...</code> instead of the expected output: <code>1 + 2 ...</code>
| * | | Fix typos in docs for ActiveRecord::Core::arel_table [ci skip]Mark Rushakoff2012-05-161-3/+1
| | | |
| * | | update AS:OrderedHash docsFrancesco Rodriguez2012-05-161-4/+8
| | | |
| * | | fixing removed empty lines and examplesFrancesco Rodriguez2012-05-168-6/+11
| | | |
| * | | fixing validates_with docsFrancesco Rodriguez2012-05-161-6/+4
| | | |
| * | | [guides] add note about cosequences of option changesRichard Hulse2012-05-161-1/+3
| | | |
| * | | [getting started] explain that posts_path exists due to how we defined ↵Ryan Bigg2012-05-161-3/+3
| | | | | | | | | | | | | | | | routes earlier
| * | | [getting started] Split up refactoring of new and edit templatesRyan Bigg2012-05-161-8/+8
| | | |
| * | | [getting started] don't call it 'a _form partial', just 'a partial'Ryan Bigg2012-05-161-1/+1
| | | |
| * | | [getting started] remove tab in form partialRyan Bigg2012-05-161-1/+1
| | | |
| * | | [getting started] Prefix users templates with 'users' to show that's where ↵Ryan Bigg2012-05-161-2/+2
| | | | | | | | | | | | | | | | they're coming from
| * | | [getting started] split up adding link for edit to index and show templatesRyan Bigg2012-05-161-4/+9
| | | |
| * | | [getting started] grammatical changes at beginning of update action sectionRyan Bigg2012-05-161-5/+7
| | | |
| * | | [getting started] some more handholding around where exactly the error would ↵Ryan Bigg2012-05-161-1/+2
| | | | | | | | | | | | | | | | appear when a post is invalid
| * | | [getting started] fix weird linebreak when talking about pluralizeRyan Bigg2012-05-161-3/+2
| | | |
| * | | [getting started] re-add new action back to PostsController, explain that ↵Ryan Bigg2012-05-161-2/+14
| | | | | | | | | | | | | | | | it'll be explained in a short while
| * | | [getting started] Explain the create action check for validations betterRyan Bigg2012-05-161-14/+3
| | | |
| * | | [getting started] add attr_accessible to Post modelRyan Bigg2012-05-161-0/+2
| | | |
| * | | [getting started] split up addition of links to index/show/new areaRyan Bigg2012-05-161-23/+7
| | | |
| * | | better format and fixes to validators docsFrancesco Rodriguez2012-05-168-104/+154
| | | |