aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Update contributing_to_ruby_on_rails.md"Vijay Dev2013-12-191-1/+1
| | | | | | This reverts commit 41ba51f4850a8cd2fe69789011ac33366366d32f. [ci skip]
* Revert "Update security.md"Vijay Dev2013-12-191-1/+1
| | | | | | This reverts commit f4804fafecdc057988575b4516afe9ca1d5f42fc. [ci skip]
* Revert "Fix on-site markdown rendering [ci skip]"Vijay Dev2013-12-191-1/+1
| | | | | | This reverts commit 427db6b9d2b35a72f3c017eb19a2e1e800b0a7a3. [ci skip]
* Revert "Underscore in markdown should be escaped with backslash [ci skip]"Vijay Dev2013-12-191-1/+1
| | | | | | | | This reverts commit b58f3a641795e1777aa3e12a853c34ff512acfb9. Reason: Discussion in https://github.com/rails/docrails/commit/b58f3a641795e1777aa3e12a853c34ff512acfb9 [ci skip]
* [ci skip] add `assets.raise_runtime_errors` flagschneems2013-12-141-2/+4
| | | | | The flag will be used in multiple places to check for errors during runtime if enabled. Source: https://github.com/rails/sprockets-rails/pull/100
* Merge branch 'master' of github.com:rails/docrailsKuldeep Aggarwal2013-12-101-1/+1
|\
| * Merge branch 'master' of github.com:lifo/docrailsaditya-kapoor2013-12-10588-6771/+10534
| |\
| * \ Merge branch 'master' of github.com:lifo/docrailsaditya-kapoor2013-09-01301-2671/+3921
| |\ \
| * | | fixed a typoaditya-kapoor2013-08-201-1/+1
| | | |
* | | | fixed typo mistake time_formats.rb -> date_formats.rb [ci skip]Kuldeep Aggarwal2013-12-101-1/+1
| |_|/ |/| |
* | | Remove an extra periodRobin Dupret2013-12-041-1/+1
| | | | | | | | | | | | As a side not, the period after etc is not always needed http://en.wiktionary.org/wiki/etc
* | | Typos. return -> returns. [ci skip]Lauro Caetano2013-12-0316-23/+23
| | |
* | | Update contributing_to_ruby_on_rails.mdHarshad Sabne2013-12-011-1/+1
| | | | | | | | | Escape hyphen
* | | Update security.mdHarshad Sabne2013-11-301-1/+1
| | | | | | | | | Add escape character for correct rendering
* | | Remove Rdoc formatting from markdown [ci skip]Harshad Sabne2013-11-291-1/+1
| | | | | | | | | Use markdown formatting instead
* | | Fix on-site markdown rendering [ci skip]Harshad Sabne2013-11-281-1/+1
| | |
* | | Underscore in markdown should be escaped with backslash [ci skip]Harshad Sabne2013-11-261-1/+1
| | | | | | | | | In the absence of proper escaping the first link was getting messed up and remaining part of the sentence (2nd link) was not displayed in the rendered markdown on the website though it was displaying correctly in the repository markdown file.
* | | Globalize has moved to a new repositoryHarshad Sabne2013-11-251-1/+1
| | | | | | | | | From (svenfuchs/globalize3) to (globalize/globalize)
* | | Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-2429-183/+203
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/lib/active_support/core_ext/hash/keys.rb
| * | | a couple of copy-edits before merging [ci skip]Xavier Noria2013-11-241-3/+2
| | | |
| * | | API Documentation Guidelines link correction [ci skip]Harshad Sabne2013-11-231-1/+1
| | | |
| * | | Improve reading / style of hashes in AR guideCarlos Antonio da Silva2013-11-191-5/+5
| | | |
| * | | Revert last two commits mistakenly changing join/include syntaxCarlos Antonio da Silva2013-11-191-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --- Revert "syntax error joining/including models" This reverts commit ac35f72f30c47298a20a90c8c537db888b463bbb. --- Revert "syntax error joining tables" This reverts commit c365986b48c3e8bc8c7f3fa6a8521616ed5dc138. --- Comments: https://github.com/rails/docrails/commit/c365986b48c3e8bc8c7f3fa6a8521616ed5dc138#commitcomment-4630684
| * | | syntax error joining/including modelsSergio2013-11-181-2/+2
| | | | | | | | | | | | syntax error joining/including models
| * | | syntax error joining tablesSergio2013-11-181-5/+5
| | | | | | | | | | | | syntax error joining tables
| * | | The option is called encode_big_decimal_as_string [ci-skip]Godfrey Chan2013-11-151-1/+1
| | | |
| * | | Update action_controller_overview.md [ci skip]Harshad Sabne2013-11-151-1/+1
| | | | | | | | | | | | Code style adherence
| * | | Fix broken Wikipedia link.Harshad Sabne2013-11-131-1/+1
| | | |
| * | | Remove outdated guide on using rack builder w/o rails middlewareAlex Johnson2013-11-131-20/+0
| | | | | | | | | | | | | | | | [ci skip]
| * | | Correct guide relating MiddlewareStackProxy with EnumerableAlex Johnson2013-11-131-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Enumerable.instance_methods & Rails::Configuration::MiddlewareStackProxy.instance_methods # => [:as_json] MiddlewareStackProxy does not share any notable methods with Enumerable.
| * | | [ci skip] Replace #=> with # =>Alex Johnson2013-11-123-17/+17
| | | |
| * | | Fix RailsServer#start content in initialization guideAlex Johnson2013-11-121-17/+23
| | | | | | | | | | | | | | | | [ci skip]
| * | | Change syntax format for example returned valuesPrem Sichanugrist2013-11-1119-107/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to our guideline, we leave 1 space between `#` and `=>`, so we want `# =>` instead of `#=>`. Thanks to @fxn for the suggestion. [ci skip]
| * | | Add section for command_tasks in initialization guideAlex Johnson2013-11-081-12/+42
| | | | | | | | | | | | | | | | [ci skip]
| * | | Update commands.rb content in initialization guideAlex Johnson2013-11-081-2/+8
| | | | | | | | | | | | | | | | [ci skip]
| * | | Update README.rdoc [ci skip]Harshad Sabne2013-11-081-1/+1
| | | | | | | | | | | | Highlighted code
* | | | Merge pull request #13021 from razielgn/rbx-gemfile-and-travis-fixesRafael Mendonça França2013-11-241-1/+1
|\ \ \ \ | | | | | | | | | | Updated allow_failures for Rubinius 2.2.1.
| * | | | Updated allow_failures for Rubinius 2.2.1.Federico Ravasio2013-11-241-1/+1
|/ / / /
* | | | Merge pull request #13019 from razielgn/rbx-gemfile-and-travis-fixesRafael Mendonça França2013-11-242-5/+3
|\ \ \ \ | | | | | | | | | | Rubinius Gemfile and travis fixes
| * | | | Properly fix Rubinius dependencies in Gemfile & Travis integration.Federico Ravasio2013-11-242-5/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before Rubinius 2.2.0, some parts of the stdlib were lazily loaded, even if not included in the Gemfile. Now it's 100% required to include the gem 'rubysl', otherwise the stdlib is not available entirely, breaking everything. Also, the rubysl-test-unit gem was depending on minitest ~> 4.7, thus causing conflicts with Rails's dependency on minitest 5. That is not the case anymore since rubysl-test-unit 2.0.2, so it is completely safe to include it fully. When Travis is going to update RVM to 1.24, it'll be safe to use rbx-2, thus picking new versions automatically.
* | | | Merge pull request #13016 from arunagw/test-for-skip-assets-controllerGuillermo Iguaran2013-11-231-0/+6
|\ \ \ \ | | | | | | | | | | Test for when controller with skip-assets
| * | | | Test for when controller with skip-assetsArun Agrawal2013-11-231-0/+6
|/ / / /
* | | | Merge pull request #13015 from arunagw/task-creation-command-testYves Senn2013-11-231-1/+13
|\ \ \ \ | | | | | | | | | | Added test when task generator called on revoke
| * | | | Added test when task generator called on revokeArun Agrawal2013-11-231-1/+13
|/ / / /
* | | | Merge pull request #13012 from harrigan/masterYves Senn2013-11-231-1/+1
|\ \ \ \ | | | | | | | | | | Helper should be a module in Rails guides [ci skip]
| * | | | Helper should be a module in Rails guides [ci skip]Martin Harrigan2013-11-231-1/+1
|/ / / /
* | | | Merge pull request #13011 from arunagw/jruby-fixesYves Senn2013-11-231-2/+10
|\ \ \ \ | | | | | | | | | | Using activerecord-jdbcsqlite3-adapter
| * | | | Using activerecord-jdbcsqlite3-adapterArun Agrawal2013-11-231-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | PluginGeneratorTest needs to have activerecord-jdbcsqlite3-adapter to pass under JRuby
* | | | | Merge pull request #13010 from arunagw/cleanedup-generator-testYves Senn2013-11-231-21/+6
|\ \ \ \ \ | |/ / / / |/| | | | Cleaned up app generator test
| * | | | Cleaned up app generator testArun Agrawal2013-11-231-21/+6
|/ / / /
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-14 11:28:28 +0000