aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #15073 from ifyouseewendy/masterRafael Mendonça França2014-05-131-5/+32
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update require in `array_ext_test.rb`wendi2014-05-131-3/+2
| * | | | | | | | | | Update and add tests in array_ext_test.rbwendi2014-05-131-2/+30
* | | | | | | | | | | calls with :host should still use the optimized pathAaron Patterson2014-05-131-2/+2
* | | | | | | | | | | Merge pull request #15094 from gsamokovarov/patch-1Rafael Mendonça França2014-05-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove falsy deprecation note in AS guides [ci skip]Genadi Samokovarov2014-05-131-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | use fewer method calls to determine the url_for optionsAaron Patterson2014-05-131-5/+4
* | | | | | | | | | just merge instead of dup and mergeAaron Patterson2014-05-131-2/+1
* | | | | | | | | | the :only_path option is applied by the time the helper is calledAaron Patterson2014-05-131-4/+1
* | | | | | | | | | options already have symbolized keys, so we can avoid this callAaron Patterson2014-05-131-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #15091 from printercu/patch-5Andrew White2014-05-131-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Do not check defined?(CGI) on every call #to_queryprintercu2014-05-131-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Fix assertion order and :scissors: extra spacesCarlos Antonio da Silva2014-05-132-4/+3
* | | | | | | | | Merge pull request #15068 from josepjaume/patch-1Aaron Patterson2014-05-132-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Dup options hash to prevent modificationsJosep Jaume Rey2014-05-132-0/+8
* | | | | | | | | | pg, clarify default behavior for composite types.Yves Senn2014-05-131-7/+94
* | | | | | | | | | extract pg type map initialization process to `TypeMapInitializer`.Yves Senn2014-05-132-65/+74
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Get rid of unused methodCarlos Antonio da Silva2014-05-131-11/+0
* | | | | | | | | Simplify merge call on polymorphic helpersCarlos Antonio da Silva2014-05-131-2/+2
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | test, move all pg array tests into `postgresql/array_test.rb`.Yves Senn2014-05-132-51/+29
* | | | | | | | Merge pull request #15084 from arthurnn/fix_assert_redirected_toAndrew White2014-05-132-1/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix regression on `assert_redirected_to`.Arthur Neves2014-05-132-1/+13
* | | | | | | | | Merge pull request #15083 from zuhao/refactor_actionmailer_i18n_with_controll...Yves Senn2014-05-131-11/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use with_translation helper to clean up I18n stored translations.Zuhao Wan2014-05-131-11/+14
| |/ / / / / / / /
* | | | | | | | | Merge pull request #15082 from zuhao/refactor_actionmailer_delivery_methods_testYves Senn2014-05-131-30/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move state restoration from setup/teardown into affected test cases.Zuhao Wan2014-05-131-30/+42
* | | | | | | | | | Merge pull request #15086 from zuhao/refactor_actionmailer_mail_layout_testYves Senn2014-05-131-10/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unnecessary setup and teardown.Zuhao Wan2014-05-131-10/+0
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | docs, explain usage of `count` + `select`. Closes #15065. [ci skip]Yves Senn2014-05-131-0/+8
* | | | | | | | | | Merge pull request #15085 from zuhao/refactor_actionmailer_log_subscriber_testYves Senn2014-05-131-3/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | A minor stylistic fix and cleanup of mail deliveries.Zuhao Wan2014-05-131-3/+5
|/ / / / / / / / /
* | | | | | | | | fix bad mergeAaron Patterson2014-05-121-15/+0
* | | | | | | | | avoid array allocation when extracting usernames and passwordsAaron Patterson2014-05-121-1/+7
* | | | | | | | | Ok. Enough models for today :rage:Rafael Mendonça França2014-05-121-3/+6
* | | | | | | | | Test with ruby-head to make @tenderlove happyRafael Mendonça França2014-05-121-0/+2
* | | | | | | | | This is also a modelRafael Mendonça França2014-05-121-1/+1
* | | | | | | | | This model is a model so it should behaves like oneRafael Mendonça França2014-05-121-7/+3
* | | | | | | | | Merge pull request #15080 from eileencodes/flip-unless-else-conditional-in-ha...Rafael Mendonça França2014-05-121-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | flip conditional to use if/else instead of unless/elseeileencodes2014-05-121-3/+3
|/ / / / / / / / /
* | | | | | | | | Revert "reduce conditionals in url_for"Aaron Patterson2014-05-121-6/+3
* | | | | | | | | :cry::gun: use an empty hash for magical speed.Aaron Patterson2014-05-121-1/+5
* | | | | | | | | this class is a model, so it should act like oneAaron Patterson2014-05-121-0/+3
* | | | | | | | | use the helper method builder to construct helper methodsAaron Patterson2014-05-123-59/+118
* | | | | | | | | probably should not check in a raiseAaron Patterson2014-05-121-1/+0
* | | | | | | | | undo optimized calls until the builder object is finishedAaron Patterson2014-05-123-41/+23
* | | | | | | | | remove suffix from the handler methodsAaron Patterson2014-05-121-20/+19
* | | | | | | | | push list handling to the builder objectAaron Patterson2014-05-121-30/+30
* | | | | | | | | push string handling to the builder objectAaron Patterson2014-05-121-10/+8
* | | | | | | | | push model and class handling to a helper builder objectAaron Patterson2014-05-121-36/+48
* | | | | | | | | adding a method to handle strings using the same apiAaron Patterson2014-05-121-22/+32