aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-275-17/+68
|\
| * copy edits [ci skip]Vijay Dev2012-05-271-3/+3
| |
| * update Module#mattr_accessor documentation [ci skip]Francesco Rodriguez2012-05-261-6/+6
| |
| * remove unnecessary ruby 1.8 reference from active_record/core [ci skip]Francesco Rodriguez2012-05-261-3/+4
| |
| * add CollectionProxy#uniq documentationFrancesco Rodriguez2012-05-261-0/+21
| |
| * update Hash documentation with 1.9 syntax [ci skip]Francesco Rodriguez2012-05-261-8/+16
| |
| * add examples to Hash#deep_stringify_keys and Hash#deep_symbolize_keys [ci skip]Francesco Rodriguez2012-05-261-0/+10
| |
| * Add some information about handle_unverified_request to guides.Erich Menge2012-05-261-0/+11
| |
| * Revert "Small correction to contributing_to_rails in the section for testing ↵Deepak Kannan2012-05-261-6/+0
| | | | | | | | ActiveRecord " This reverts commit 0cfbaa030a0684aaa89d3d3c85528e80c1995836. Sorry did not see the section on MySql and PostgreSQL # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: guides/source/contributing_to_ruby_on_rails.textile #
| * Small correction to contributing_to_rails in the section for testing ↵Deepak Kannan2012-05-261-0/+6
| | | | | | | | | | | | | | | | ActiveRecord Initially the guide suggests to install gems via "bundle install --without db" But tests for ActiveRecord need to install the gems in db group also, like mysql. The patch clears the bundler options in ".bundle/config" and installs all the gems in Gemfile
* | Fix railties_order when application object is passedPiotr Sarnacki2012-05-272-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | railites_order method, introduced in 40b19e0, had a bug that was causing loading application instance twice in initializers if railties_order already included application instance. So for example railties_order = [Foo::Engine, :main_app, Bar::Engine] would result in such railties array: [MyApp::Application, Foo::Engine, MyAppApplication, Bar::Engine] In order to fix it, we need to check for existence of application in both railties_order and railties arrays.
* | Update initialization guide [ci skip]Vijay Dev2012-05-271-64/+32
| | | | | | | | | | | | * update rails versions * remove outdated code snippets * few more corrections
* | Add `:escape` option for `truncate`Rafael Mendonça França2012-05-263-2/+29
| | | | | | | | This options can be used to not escape the result by default.
* | Update the documentation and add CHANGELOG entryRafael Mendonça França2012-05-263-4/+6
| |
* | Test that the block used in truncate is escaped if it is not HTML safeRafael Mendonça França2012-05-262-25/+23
| | | | | | | | Refactoring the truncate method to not do a sort-circuit return
* | Merge pull request #6031 from lellisga/truncate_readmeRafael Mendonça França2012-05-263-10/+45
|\ \ | |/ |/| | | Truncate now has the ability to receive a html option that allows it to call rails helpers.
| * Truncate now has the ability to receive a html option that allows it to call ↵Li Ellis Gallardo2012-05-263-10/+45
|/ | | | | | | | | | | | rails helpers. This way if my text is long I don't have to do something like this: .text = truncate(@text, :length => 27) if @text.size >= 27 = link_to "continue", notes_path, ....."")
* some small corrections & wrapping changes in the initialization guideVijay Dev2012-05-261-11/+4
| | | | This guide is currently a wip and pending reviews. [ci skip]
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-2611-76/+344
|\
| * fix mention of ruby versions that rails 4 won't run on [ci skip]Vijay Dev2012-05-261-1/+1
| |
| * make it explicit that bundle install at the time of app creationVijay Dev2012-05-261-1/+1
| | | | | | | | | | | | installs only the gems that are already in the gemfile [ci skip]
| * [routing guide] Add mention of get '/:username' routeRyan Bigg2012-05-261-0/+8
| | | | | | | | This is fairly common in Rails applications and is requested a lot of the time on Stack Overflow and #rubyonrails
| * add :nodoc: to CollectionProxy#initializeFrancesco Rodriguez2012-05-251-1/+1
| |
| * add CollectionProxy#== documentationFrancesco Rodriguez2012-05-251-0/+24
| |
| * add CollectionProxy#count documentationFrancesco Rodriguez2012-05-251-0/+26
| |
| * add CollectionProxy#to_ary documentationFrancesco Rodriguez2012-05-251-2/+35
| |
| * add CollectionProxy#delete documentationFrancesco Rodriguez2012-05-251-1/+104
| |
| * Update paths in action_view_overview raislguide to reflect asset pipeline ↵Tadas Tamosauskas2012-05-251-22/+28
| | | | | | | | conventions.
| * [getting started] specify which kind of temporary files are stored in the ↵Rafael Magana2012-05-251-1/+1
| | | | | | | | /tmp folder
| * [Guides] Add missing file descriptionsOscar Del Ben2012-05-251-1/+17
| |
| * [Guides] Add inflector exampleOscar Del Ben2012-05-251-0/+4
| |
| * [getting started] specify what # and $ denotes in the prompt in unix-like OSsRafael Magana2012-05-251-1/+1
| |
| * [getting started] specify that rails new blog executes bundle installRafael Magana2012-05-251-1/+1
| |
| * Add comment for attr_accessible/attr_protected :as option. [ci skip]Edward Tsech2012-05-251-2/+2
| |
| * Fix unbalanced braces in Hash#typecast_xml_value internal commentAlexey Vakhov2012-05-251-1/+1
| |
| * Clean Date#beginning_of_month descriptionAlexey Vakhov2012-05-251-1/+1
| | | | | | | | | | Unnecessary peace of text was injected at 507da04a149b44e20c5a0ba72a218fe1762b6baf by mistake.
| * Merge branch 'master' of github.com:lifo/docrailsMikhail Vaysman2012-05-251-10/+13
| |\
| | * Update examples of Array #in_groups and #in_groups_ofAlexey Vakhov2012-05-251-10/+13
| | | | | | | | | | | | | | | Examples should be not square to visually underline a difference between Array#in_groups and Array#in_groups_of.
| * | references to the old behavior removedMikhail Vaysman2012-05-251-4/+3
| |/
| * Fix ActiveSupport Cache decrement method descriptionAlexey Vakhov2012-05-251-1/+1
| |
| * [Guides] Update rack exampleOscar Del Ben2012-05-241-1/+0
| |
| * [Guides] Add core_ext/object sectionOscar Del Ben2012-05-241-1/+25
| |
| * [Guides] Rewrite Rails application sectionOscar Del Ben2012-05-241-18/+11
| |
| * [Guides] Add extract_options sectionOscar Del Ben2012-05-241-3/+26
| |
| * [Guides] Update ruby version checkOscar Del Ben2012-05-241-2/+8
| |
| * [Guides] Add sprockets to list of loaded frameworksOscar Del Ben2012-05-241-0/+1
| |
| * capitalize HTML5 in Getting Started GuideRory O’Kane2012-05-241-1/+1
| | | | | | | | | | | | | | | | these pages capitalize “HTML5”: http://en.wikipedia.org/wiki/HTML5 http://dev.w3.org/html5/spec/ http://www.html5rocks.com/en/
| * grammar fixes in a tip in Rails routing guideRory O’Kane2012-05-241-1/+1
| |
| * typosMikhail Dieterle2012-05-241-3/+3
| |
* | Merge pull request #6454 from rafmagana/guides_rails_on_rackVijay Dev2012-05-261-21/+41
|\ \ | | | | | | [guides] Update rails on rack