Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #13244 from kommen/pg_enum_type_map | Yves Senn | 2014-03-04 | 4 | -0/+45 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add Enum type to postgresql adapter's oids to prevent unknown OID warnings. | Dieter Komendera | 2014-03-04 | 4 | -0/+45 | |
| |/ / / / / / | ||||||
* | | | | | | | Use 1.9 style hash on docs [ci skip] | Carlos Antonio da Silva | 2014-03-04 | 1 | -1/+1 | |
* | | | | | | | Simplify handling of defaults/options in button_tag | Carlos Antonio da Silva | 2014-03-04 | 1 | -4/+1 | |
* | | | | | | | Added missing changlog entry for #14255 | Godfrey Chan | 2014-03-04 | 1 | -0/+7 | |
* | | | | | | | Merge pull request #14255 from prikha/master | Godfrey Chan | 2014-03-04 | 2 | -5/+19 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | remove private method and rewrite into more precise notation | Sergey Prikhodko | 2014-03-04 | 1 | -12/+12 | |
| * | | | | | | rollback to private method | Sergey Prikhodko | 2014-03-03 | 1 | -5/+9 | |
| * | | | | | | cleanup and move extracted method right into the helper | Sergey Prikhodko | 2014-03-03 | 1 | -9/+5 | |
| * | | | | | | fix content_or_options to be replaced by options and set to nil | Sergey Prikhodko | 2014-03-03 | 1 | -1/+6 | |
| * | | | | | | fix indentations | Sergey Prikhodko | 2014-03-03 | 1 | -4/+3 | |
| * | | | | | | fix form button | Sergey Prikhodko | 2014-03-03 | 1 | -5/+2 | |
| * | | | | | | fix button tag without options | Sergey Prikhodko | 2014-03-03 | 1 | -2/+2 | |
| * | | | | | | fix accept nil options | Sergey Prikhodko | 2014-03-03 | 1 | -3/+5 | |
| * | | | | | | fixes default attributes for button_tag | Sergey Prikhodko | 2014-03-03 | 2 | -7/+18 | |
* | | | | | | | Merge pull request #14258 from shuhei/fix_deep_munge_log | Carlos Antonio da Silva | 2014-03-03 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add spaces to deep_munge log message. | Shuhei Kagawa | 2014-03-03 | 1 | -3/+3 | |
|/ / / / / / / | ||||||
* | / / / / / | Add a comment to ensure that a test won't be removed [ci skip] | Robin Dupret | 2014-03-03 | 1 | -1/+1 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #14239 from zzak/refactor_actionpack_dispatch_request_tests | Jeremy Kemper | 2014-03-02 | 2 | -370/+386 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Refactor tests from BaseRackTest into BaseRequestTest | Zachary Scott | 2014-03-01 | 2 | -370/+386 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #14248 from vipulnsward/fix-pg-ar-warnings | Yves Senn | 2014-03-02 | 2 | -2/+2 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Fix warnings due to: | Vipul A M | 2014-03-03 | 2 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #14234 from arthurnn/fix_trans_on_replace | Santiago Pastorino | 2014-03-01 | 2 | -1/+13 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove unnecessary db call when replacing. | Arthur Neves | 2014-02-28 | 2 | -1/+13 | |
* | | | | | | Merge pull request #14240 from sferik/flat_map | José Valim | 2014-03-01 | 2 | -5/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Replace map.flatten(1) with flat_map | Erik Michaels-Ober | 2014-02-28 | 2 | -5/+5 | |
|/ / / / / / | ||||||
* | | | | | | make sure we wait for the threads to shut down before asserting closure | Aaron Patterson | 2014-02-28 | 1 | -0/+1 | |
* | | | | | | Merge pull request #14195 from robin850/issue-14079 | Guillermo Iguaran | 2014-02-28 | 3 | -2/+23 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Avoid namespacing routes inside engines | Robin Dupret | 2014-02-26 | 3 | -2/+23 | |
* | | | | | | | use built-in exception handling in live controllers | Aaron Patterson | 2014-02-28 | 2 | -17/+22 | |
* | | | | | | | live controllers should have live responses | Aaron Patterson | 2014-02-28 | 3 | -21/+38 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #14233 from kuldeepaggarwal/fix-secrets-doc | Guillermo Iguaran | 2014-02-28 | 2 | -4/+11 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [ci skip] use secrets.secret_key_base instead of config.secret_key_base | Kuldeep Aggarwal | 2014-03-01 | 2 | -4/+11 | |
* | | | | | | | set the error callback to a nice default in case nobody set an error callback... | Aaron Patterson | 2014-02-28 | 2 | -1/+8 | |
* | | | | | | | Merge pull request #14230 from kuldeepaggarwal/doc-select | Robin Dupret | 2014-02-28 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | [ci skip] correct select examples and doc, ref [522c0fd] | Kuldeep Aggarwal | 2014-03-01 | 1 | -4/+4 | |
* | | | | | | | Improve a bit the 4.1 release notes [ci skip] | Robin Dupret | 2014-02-28 | 1 | -4/+6 | |
* | | | | | | | Merge pull request #14226 from senny/14109_partial_revert | Aaron Patterson | 2014-02-28 | 3 | -1/+26 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | `includes` uses SQL parsing when String joins are involved. | Yves Senn | 2014-02-28 | 3 | -1/+26 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #14231 from brianstorti/bs-docs-secret-token | Guillermo Iguaran | 2014-02-28 | 1 | -3/+18 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | [ci skip] use secrets.yml instead of secret_token.rb in the action controller... | Brian Thomas Storti | 2014-02-27 | 1 | -3/+18 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #14203 from Alwahsh/aabouelhamayed | Godfrey Chan | 2014-02-27 | 3 | -0/+42 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix a bug affecting validations of enum attributes | TheMonster | 2014-02-27 | 3 | -0/+42 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #14174 from kuldeepaggarwal/fix-resource_generator_test | Yves Senn | 2014-02-27 | 3 | -5/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | modify model generator warning message. refs [#174c9f0] | Kuldeep Aggarwal | 2014-02-27 | 3 | -5/+5 | |
* | | | | | | | Replace "data store" with database [ci skip] | Robin Dupret | 2014-02-27 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #11481 from sorentwo/fetch-multi-hash | Guillermo Iguaran | 2014-02-27 | 3 | -14/+19 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Return a hash rather than array from fetch_multi | Parker Selbert | 2014-02-26 | 3 | -14/+19 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #14216 from garethson/routes-docs-typo | Arthur Nogueira Neves | 2014-02-26 | 1 | -18/+18 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fixes docs typo in nested resource path helpers [skip ci] | Gareth du Plooy | 2014-02-26 | 1 | -18/+18 |