Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update Redcarpet to 3.1.2 | Robin Dupret | 2014-05-14 | 3 | -4/+4 |
| | | | | | | | This version fixes an API breakage between 3.0 and 3.1 ; the header method's arity should not have changed. [ci skip] | ||||
* | options should always be passed to url_for | Aaron Patterson | 2014-05-13 | 1 | -2/+2 |
| | |||||
* | Merge pull request #15092 from kares/pg-array-parser | Rafael Mendonça França | 2014-05-13 | 2 | -27/+27 |
|\ | | | | | [postgres] include PgArrayParser directly | ||||
| * | [postgres] include PgArrayParser directly and only load/include ArrayParser ↵ | kares | 2014-05-13 | 2 | -27/+27 |
| | | | | | | | | if not found | ||||
* | | Merge pull request #15095 from JuanitoFatas/doc/generators | Rafael Mendonça França | 2014-05-13 | 1 | -2/+2 |
|\ \ | | | | | | | [ci skip] Fix two factual errors and highlight code in generators guide. | ||||
| * | | [ci skip] Fix a factual error and highlight code in generators guide. | Juanito Fatas | 2014-05-14 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #15072 from mjtko/fix/issue-15064 | Rafael Mendonça França | 2014-05-13 | 3 | -1/+14 |
|\ \ \ | | | | | | | | | [Fixes #15064] Calling number_to_delimited on a ActiveSupport::SafeBuffer results in mangled output | ||||
| * | | | Require active_support/core_ext/string/output_safety and use html_safe ↵ | Mark J. Titorenko | 2014-05-12 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | rather than use non-public SafeBuffer API. | ||||
| * | | | Use block parameter rather than `$1` during `gsub!` so ↵ | Mark J. Titorenko | 2014-05-12 | 3 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | `ActiveSupport::SafeBuffer` values aren't mangled. Fixes #15064 | ||||
* | | | | Merge pull request #15073 from ifyouseewendy/master | Rafael Mendonça França | 2014-05-13 | 1 | -5/+32 |
|\ \ \ \ | | | | | | | | | | | Update and add tests in array_ext_test.rb | ||||
| * | | | | Update require in `array_ext_test.rb` | wendi | 2014-05-13 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | Removed `FIMXE` tag to require necessary file but not the whole core_ext | ||||
| * | | | | Update and add tests in array_ext_test.rb | wendi | 2014-05-13 | 1 | -2/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix `test_to_with_instruct` typo to `test_to_xml_with_instruct` - Rename `test_to_xml` to `test_to_xml_with_hash_elements` to make test name more specific. - Add `test_to_xml_with_non_hash_elements` and `test_to_xml_with_non_hash_different_type_elements` `to_xml` behaves different when containing elements are same and different types. - Add `test_to_xml_with_indent_set` | ||||
* | | | | | calls with :host should still use the optimized path | Aaron Patterson | 2014-05-13 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #15094 from gsamokovarov/patch-1 | Rafael Mendonça França | 2014-05-13 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Remove falsy deprecation note in AS guides [ci skip] | ||||
| * | | | | Remove falsy deprecation note in AS guides [ci skip] | Genadi Samokovarov | 2014-05-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | This is no longer true as @jeremy removed the deprecation in 7a5601c. | ||||
* | | | | | use fewer method calls to determine the url_for options | Aaron Patterson | 2014-05-13 | 1 | -5/+4 |
| | | | | | |||||
* | | | | | just merge instead of dup and merge | Aaron Patterson | 2014-05-13 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | the :only_path option is applied by the time the helper is called | Aaron Patterson | 2014-05-13 | 1 | -4/+1 |
| | | | | | |||||
* | | | | | options already have symbolized keys, so we can avoid this call | Aaron Patterson | 2014-05-13 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #15091 from printercu/patch-5 | Andrew White | 2014-05-13 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Do not check defined?(CGI) on every call #to_query | ||||
| * | | | | Do not check defined?(CGI) on every call #to_query | printercu | 2014-05-13 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fix assertion order and :scissors: extra spaces | Carlos Antonio da Silva | 2014-05-13 | 2 | -4/+3 |
| | | | | | |||||
* | | | | | Merge pull request #15068 from josepjaume/patch-1 | Aaron Patterson | 2014-05-13 | 2 | -0/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Dup options hash to prevent modifications | ||||
| * | | | | | Dup options hash to prevent modifications | Josep Jaume Rey | 2014-05-13 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | `options[:default]` and `options[:raise]` can be mistakenly added to the `options` hash. This can be a problem if you're reusing the same object. | ||||
* | | | | | | pg, clarify default behavior for composite types. | Yves Senn | 2014-05-13 | 1 | -7/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * by default composite types are mapped as `OID::Identity` and issue a warning * the user is advised to register his own `OID::Type` to make use of composite types Registering a new `OID::Type` does currently not allow to specify the type casting behavior when writing to the database. In order for it to work we need to use the values within `@attributes`. They are already being type casted and are ready to be written to the DB. See https://github.com/rails/rails/blob/57643c961feb24b662620d330e71103a830003e8/activerecord/lib/active_record/attribute_methods.rb#L460-L462 | ||||
* | | | | | | extract pg type map initialization process to `TypeMapInitializer`. | Yves Senn | 2014-05-13 | 2 | -65/+74 |
| |/ / / / |/| | | | | |||||
* | | | | | Get rid of unused method | Carlos Antonio da Silva | 2014-05-13 | 1 | -11/+0 |
| | | | | | | | | | | | | | | | | | | | | It's usage has been removed in 325c9d5e5235db4b5210d9db6c863835d1ac7eed. | ||||
* | | | | | Simplify merge call on polymorphic helpers | Carlos Antonio da Silva | 2014-05-13 | 1 | -2/+2 |
| |_|_|/ |/| | | | |||||
* | | | | test, move all pg array tests into `postgresql/array_test.rb`. | Yves Senn | 2014-05-13 | 2 | -51/+29 |
| | | | | |||||
* | | | | Merge pull request #15084 from arthurnn/fix_assert_redirected_to | Andrew White | 2014-05-13 | 2 | -1/+13 |
|\ \ \ \ | | | | | | | | | | | Fix regression on `assert_redirected_to`. | ||||
| * | | | | Fix regression on `assert_redirected_to`. | Arthur Neves | 2014-05-13 | 2 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `assert_redirected_to` would fail if there is no controller set on a `ActionDispatch::IntegrationTest`, as _compute_redirect_to_location would be called on the controller to build the url. This regression was introduced after 1dacfbabf3bb1e0a9057dd2a016b1804e7fa38c0. [fixes #14691] | ||||
* | | | | | Merge pull request #15083 from ↵ | Yves Senn | 2014-05-13 | 1 | -11/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | zuhao/refactor_actionmailer_i18n_with_controller_test Use with_translation helper to clean up I18n stored translations. | ||||
| * | | | | | Use with_translation helper to clean up I18n stored translations. | Zuhao Wan | 2014-05-13 | 1 | -11/+14 |
| |/ / / / | |||||
* | | | | | Merge pull request #15082 from zuhao/refactor_actionmailer_delivery_methods_test | Yves Senn | 2014-05-13 | 1 | -30/+42 |
|\ \ \ \ \ | | | | | | | | | | | | | Clean up deliveries after each test. | ||||
| * | | | | | Move state restoration from setup/teardown into affected test cases. | Zuhao Wan | 2014-05-13 | 1 | -30/+42 |
| | | | | | | |||||
* | | | | | | Merge pull request #15086 from zuhao/refactor_actionmailer_mail_layout_test | Yves Senn | 2014-05-13 | 1 | -10/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Do not clear deliveries in setup. | ||||
| * | | | | | | Remove unnecessary setup and teardown. | Zuhao Wan | 2014-05-13 | 1 | -10/+0 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | docs, explain usage of `count` + `select`. Closes #15065. [ci skip] | Yves Senn | 2014-05-13 | 1 | -0/+8 |
| | | | | | | |||||
* | | | | | | Merge pull request #15085 from zuhao/refactor_actionmailer_log_subscriber_test | Yves Senn | 2014-05-13 | 1 | -3/+5 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | A minor stylistic fix and cleanup of mail deliveries. | ||||
| * | | | | | A minor stylistic fix and cleanup of mail deliveries. | Zuhao Wan | 2014-05-13 | 1 | -3/+5 |
|/ / / / / | |||||
* | | | | | fix bad merge | Aaron Patterson | 2014-05-12 | 1 | -15/+0 |
| | | | | | |||||
* | | | | | avoid array allocation when extracting usernames and passwords | Aaron Patterson | 2014-05-12 | 1 | -1/+7 |
| | | | | | |||||
* | | | | | Ok. Enough models for today :rage: | Rafael Mendonça França | 2014-05-12 | 1 | -3/+6 |
| | | | | | |||||
* | | | | | Test with ruby-head to make @tenderlove happy | Rafael Mendonça França | 2014-05-12 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | This is also a model | Rafael Mendonça França | 2014-05-12 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | This model is a model so it should behaves like one | Rafael Mendonça França | 2014-05-12 | 1 | -7/+3 |
| | | | | | |||||
* | | | | | Merge pull request #15080 from ↵ | Rafael Mendonça França | 2014-05-12 | 1 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | eileencodes/flip-unless-else-conditional-in-halting-method flip conditional to use if/else instead of unless/else | ||||
| * | | | | | flip conditional to use if/else instead of unless/else | eileencodes | 2014-05-12 | 1 | -3/+3 |
|/ / / / / | | | | | | | | | | | | | | | | Use if/else instead of unless/else so conditional reads better. | ||||
* | | | | | Revert "reduce conditionals in url_for" | Aaron Patterson | 2014-05-12 | 1 | -6/+3 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 9df60693d77813b362fb528fc62381ac8f1eec12. | ||||
* | | | | | :cry::gun: use an empty hash for magical speed. | Aaron Patterson | 2014-05-12 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, if the hash is empty, we choose "optimized" routes. I am not sure how or why optimized routes differ from regular routes. But, if we make sure the hash is empty, we get a nice speed improvement. |