Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | | | Fix to_param when attribute has multibyte character | rono23 | 2013-12-19 | 2 | -2/+10 |
| | | | | | |||||
* | | | | | make clear that config/secrets.yml passes through ERB and therefore supports ENV | Xavier Noria | 2013-12-18 | 1 | -0/+6 |
|/ / / / | |||||
* | | | | Always point to latest rbx and jruby in travis | Santiago Pastorino | 2013-12-18 | 1 | -4/+4 |
| | | | | |||||
* | | | | document how to access mail previews. [ci skip] | Yves Senn | 2013-12-18 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | /cc @pixeltrix | ||||
* | | | | Fix nil assignment to polymorphic belongs_to | Jeremy Kemper | 2013-12-18 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning nil to a polymorphic belongs_to would nullify its _id field by not its _type field. Fixes failing test from c141dfc838a5dca9f197814410fa5d44c143129c. Regression from 1678e959e973de32287b65c52ebc6cce87148951. | ||||
* | | | | Merge pull request #13370 from abhishekjain16/refactor_rails | Yves Senn | 2013-12-18 | 1 | -16/+10 |
|\ \ \ \ | | | | | | | | | | | duplication removed(DRY) | ||||
| * | | | | duplication removed(DRY) | abhishek | 2013-12-18 | 1 | -16/+10 |
| | | | | | |||||
* | | | | | Merge pull request #13373 from sbagdat/patch-1 | Damien Mathieu | 2013-12-18 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix typo [ci skip] | ||||
| * | | | | | Fix typo [ci skip] | Sıtkı Bağdat | 2013-12-18 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Added a link to the Module#concerning docs from the 4.1 release notes [ci skip] | Godfrey Chan | 2013-12-18 | 1 | -4/+8 |
| | | | | | |||||
* | | | | | Merge pull request #13367 from abhishekjain16/new_branch | Yves Senn | 2013-12-18 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | change to DateTime.civil_from_format from DateTime.civil_from_fromat in ... [ci skip] | ||||
| * | | | | change to DateTime.civil_from_format from DateTime.civil_from_fromat in ↵ | abhishek | 2013-12-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | changelog [ci skip] | ||||
* | | | | | Merge pull request #13340 from akshay-vishnoi/typo | Godfrey Chan | 2013-12-18 | 1 | -5/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | #none documentation updated [ci skip] | ||||
| * | | | | | #none documentation updated [ci skip] | Akshay Vishnoi | 2013-12-18 | 1 | -5/+4 |
| | | | | | | |||||
* | | | | | | Use annotated git tags for release task | Jeremy Kemper | 2013-12-18 | 2 | -2/+2 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | we should use annotated tags for releases. | Yves Senn | 2013-12-18 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Annotated tags will provide us with Tagger and Time information. | ||||
* | | | | | Merge pull request #13363 from kuldeepaggarwal/f-video-options | Guillermo Iguaran | 2013-12-17 | 2 | -5/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | allow video_tag to accept `size` as `Number` for square shaped videos | ||||
| * | | | | | allow video_tag to accept `size` as `Number` for square shaped videos | Kuldeep Aggarwal | 2013-12-18 | 2 | -5/+11 |
| | | | | | | |||||
* | | | | | | Merge pull request #13364 from corprew/patch-1 | Arun Agrawal | 2013-12-17 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | typo: should be 'DateTime.civil_from_format' and not 'DateTime.civil_from_fromat' | ||||
| * | | | | | typo: should be 'DateTime.civil_from_format' and not ↵ | Corprew Reed | 2013-12-17 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | 'DateTime.civil_from_fromat' | ||||
* | | | | | Add a failing test for assigning nil to a polymorphic belongs_to not ↵ | Jeremy Kemper | 2013-12-17 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | nullifying its _type column | ||||
* | | | | | Merge pull request #13358 from JuanitoFatas/patch/release-notes | Carlos Antonio da Silva | 2013-12-17 | 1 | -7/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Prettify the removals from Action Controller in 4.1 release notes. [ci skip] | ||||
| * | | | | | [ci skip] Prettify the removals from Action Controller in 4.1 release notes. | Juanito Fatas | 2013-12-18 | 1 | -7/+9 |
|/ / / / / |