aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove need for :all symboleileencodes2014-05-131-13/+6
* begin refactoring delete_records methodeileencodes2014-05-133-13/+30
* Merge pull request #15100 from eileencodes/remove-deprecation-warning-no-long...Godfrey Chan2014-05-132-6/+4
|\
| * remove deprecation warningeileencodes2014-05-132-6/+4
* | _recall should be set to a hash or not setAaron Patterson2014-05-132-4/+4
* | we never call url_for with a block, so rmAaron Patterson2014-05-131-1/+0
|/
* drop || test for cases that do not need itAaron Patterson2014-05-132-4/+6
* no need to check for presence, script names can be blankAaron Patterson2014-05-131-2/+2
* extend with a module then use define_methodAaron Patterson2014-05-131-7/+4
* this method should always have a parameter passed to it, so remove the defaultAaron Patterson2014-05-131-1/+1
* options should always be passed to url_forAaron Patterson2014-05-131-2/+2
* Merge pull request #15092 from kares/pg-array-parserRafael Mendonça França2014-05-132-27/+27
|\
| * [postgres] include PgArrayParser directly and only load/include ArrayParser i...kares2014-05-132-27/+27
* | Merge pull request #15095 from JuanitoFatas/doc/generatorsRafael Mendonça França2014-05-131-2/+2
|\ \
| * | [ci skip] Fix a factual error and highlight code in generators guide.Juanito Fatas2014-05-141-2/+2
* | | Merge pull request #15072 from mjtko/fix/issue-15064Rafael Mendonça França2014-05-133-1/+14
|\ \ \
| * | | Require active_support/core_ext/string/output_safety and use html_safe rather...Mark J. Titorenko2014-05-121-1/+2
| * | | Use block parameter rather than `$1` during `gsub!` so `ActiveSupport::SafeBu...Mark J. Titorenko2014-05-123-1/+13
* | | | 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