Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix few typos and improve markup at some levels | Robin Dupret | 2013-12-24 | 4 | -5/+5 |
| | |||||
* | [ci skip] trailing documentation whitespace | schneems | 2013-12-19 | 1 | -10/+10 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-12-20 | 21 | -28/+30 |
|\ | |||||
| * | Revert "Update contributing_to_ruby_on_rails.md" | Vijay Dev | 2013-12-19 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 41ba51f4850a8cd2fe69789011ac33366366d32f. [ci skip] | ||||
| * | Revert "Update security.md" | Vijay Dev | 2013-12-19 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit f4804fafecdc057988575b4516afe9ca1d5f42fc. [ci skip] | ||||
| * | Revert "Fix on-site markdown rendering [ci skip]" | Vijay Dev | 2013-12-19 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 427db6b9d2b35a72f3c017eb19a2e1e800b0a7a3. [ci skip] | ||||
| * | Revert "Underscore in markdown should be escaped with backslash [ci skip]" | Vijay Dev | 2013-12-19 | 1 | -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` flag | schneems | 2013-12-14 | 1 | -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/docrails | Kuldeep Aggarwal | 2013-12-10 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'master' of github.com:lifo/docrails | aditya-kapoor | 2013-12-10 | 588 | -6771/+10534 |
| | |\ | |||||
| | * \ | Merge branch 'master' of github.com:lifo/docrails | aditya-kapoor | 2013-09-01 | 301 | -2671/+3921 |
| | |\ \ | |||||
| | * | | | fixed a typo | aditya-kapoor | 2013-08-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fixed typo mistake time_formats.rb -> date_formats.rb [ci skip] | Kuldeep Aggarwal | 2013-12-10 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
| * | | | Remove an extra period | Robin Dupret | 2013-12-04 | 1 | -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 Caetano | 2013-12-03 | 16 | -23/+23 |
| | | | | |||||
| * | | | Update contributing_to_ruby_on_rails.md | Harshad Sabne | 2013-12-01 | 1 | -1/+1 |
| | | | | | | | | | | | | Escape hyphen | ||||
| * | | | Update security.md | Harshad Sabne | 2013-11-30 | 1 | -1/+1 |
| | | | | | | | | | | | | Add escape character for correct rendering | ||||
| * | | | Remove Rdoc formatting from markdown [ci skip] | Harshad Sabne | 2013-11-29 | 1 | -1/+1 |
| | | | | | | | | | | | | Use markdown formatting instead | ||||
| * | | | Fix on-site markdown rendering [ci skip] | Harshad Sabne | 2013-11-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | Underscore in markdown should be escaped with backslash [ci skip] | Harshad Sabne | 2013-11-26 | 1 | -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 repository | Harshad Sabne | 2013-11-25 | 1 | -1/+1 |
| | | | | | | | | | | | | From (svenfuchs/globalize3) to (globalize/globalize) | ||||
* | | | | couple of tweaks to the release notes [ci skip] | Xavier Noria | 2013-12-19 | 1 | -2/+2 |
| | | | | |||||
* | | | | pass over half of the release notes [ci skip] | Xavier Noria | 2013-12-19 | 1 | -36/+38 |
| | | | | |||||
* | | | | Merge pull request #13406 from hincupetru/master | Rafael Mendonça França | 2013-12-19 | 2 | -1/+7 |
|\ \ \ \ | | | | | | | | | | | Fixed configurable.rb regular expression name check | ||||
| * | | | | Fixed configurable.rb regular expression name check | Hincu Petru | 2013-12-19 | 2 | -1/+7 |
| | | | | | |||||
* | | | | | Fix assertions for testing unknown formats using Mime::NullType | Carlos Antonio da Silva | 2013-12-19 | 1 | -5/+5 |
| | | | | | |||||
* | | | | | Merge pull request #13404 from JuanitoFatas/remove-tt | Rafael Mendonça França | 2013-12-19 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | [ci skip] Remove <tt> tag in 4_1_release notes. | ||||
| * | | | | | [ci skip] Remove <tt> tag in 4_1_release notes. | Juanito Fatas | 2013-12-19 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #13401 from akshay-vishnoi/refactor | Rafael Mendonça França | 2013-12-19 | 2 | -9/+13 |
|\ \ \ \ \ | |/ / / / |/| | | | | Prevent creation of instance methods when `instance_reader = false`, Grammar checks, Conditional statements combined | ||||
| * | | | | Prevent creation of instance methods when `instance_reader = false`, Grammar ↵ | Akshay Vishnoi | 2013-12-19 | 2 | -9/+13 |
| | | | | | | | | | | | | | | | | | | | | checks, Conditional statements combined | ||||
* | | | | | Merge pull request #13395 from kuldeepaggarwal/postgres-table-ref-regex | Carlos Antonio da Silva | 2013-12-19 | 3 | -1/+28 |
|\ \ \ \ \ | | | | | | | | | | | | | modified regex for finding table_name from a multiline sql query in postgresql | ||||
| * | | | | | Fix PostgreSQL insert to properly extract table name from multiline string SQL. | Kuldeep Aggarwal | 2013-12-19 | 3 | -1/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, executing an insert SQL in PostgreSQL with a command like this: insert into articles( number) values( 5152 ) would not work because the adapter was unable to extract the correct articles table name. | ||||
* | | | | | | Show routes defined under assets prefix | Ryunosuke SATO | 2013-12-19 | 3 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #9625 | ||||
* | | | | | | Prefer assert_raise instead of flunk + rescue to test for exceptions | Carlos Antonio da Silva | 2013-12-19 | 11 | -84/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change most tests to make use of assert_raise returning the raised exception rather than relying on a combination of flunk + rescue to check for exception types/messages. | ||||
* | | | | | | Fix asserting the correct exception message in dependencies test | Carlos Antonio da Silva | 2013-12-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Minitest, the second argument of assert_raise(s) accepts a string as the message that should be shown in case of a failure in the assertion (eg nothing was raised when it should), and not the exception message to be matched. To do that we need to save the exception returned from assert_raise(s) into a local variable and check for the exception message using it. | ||||
* | | | | | | Update configuring guide with I18n options regarding available locales | Jared Beck | 2013-12-19 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add information about 'available_locales' and 'enforce_available_locales' to the configuring guide. Closes #13202. [ci skip] | ||||
* | | | | | | Merge pull request #13393 from matthewd/fix_pg_range_tests | Carlos Antonio da Silva | 2013-12-19 | 1 | -11/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix PostgreSQL range tests on fresh DB Correcting the name of the table we're creating is self-explanatory. But we must also move away from the low IDs, because we're not touching the freshly-created primary key sequence; when the time comes, @new_range will be assigned an ID of 1. | ||||
| * | | | | | | Fix PostgreSQL range tests | Matthew Draper | 2013-12-19 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes in c4044b2 meant the tests would error on a fresh DB. | ||||
* | | | | | | | Unused classes in AMo tests | Akira Matsuda | 2013-12-19 | 1 | -11/+0 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Unused classes in AS tests | Akira Matsuda | 2013-12-19 | 4 | -30/+0 |
| | | | | | | |||||
* | | | | | | Merge pull request #13400 from nishant-cyro/docs | Guillermo Iguaran | 2013-12-18 | 2 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix typos and grammar mistake [ci skip] | ||||
| * | | | | | | fix typos and grammar mistake [ci skip] | nishant-cyro | 2013-12-19 | 2 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #13398 from kuldeepaggarwal/build-fixes | Guillermo Iguaran | 2013-12-18 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | set encoding UTF-8 for accepting multibyte character | ||||
| * | | | | | | | set encoding UTF-8 for accepting multibyte character | Kuldeep Aggarwal | 2013-12-19 | 1 | -0/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #13399 from ghiculescu/patch-1 | Guillermo Iguaran | 2013-12-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Fix typo: data --> date [ci-skip] | ||||
| * | | | | | | | Fix typo: data --> date | Alex Ghiculescu | 2013-12-19 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #13366 from vipulnsward/minitest-namespace-change | Godfrey Chan | 2013-12-18 | 10 | -18/+18 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Change all `MiniTest` to `Minitest` | ||||
| * | | | | | | Change all `MiniTest` to `Minitest` since, `MiniTest` namespace has been ↵ | Vipul A M | 2013-12-18 | 10 | -18/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | renamed to `Minitest` Ref: https://github.com/seattlerb/minitest/blob/master/History.txt | ||||
* | | | | | | | Unused classes in test case | Akira Matsuda | 2013-12-19 | 1 | -25/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #13386 from rono23/fix-to-param | Rafael Mendonça França | 2013-12-18 | 2 | -2/+10 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix to_param when attribute has multibyte character |