aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge pull request #17143 from kuldeepaggarwal/fix-mailToRafael Mendonça França2015-02-202-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | do not generate blank options in mailToKuldeep Aggarwal2014-10-022-2/+8
* | | | | | | | | | | | | | | | Merge pull request #18914 from kamipo/format_time_according_to_precisionRafael Mendonça França2015-02-2013-44/+168
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add schema dumping tests for datetime and time precisionRyuta Kamizono2015-02-203-8/+34
| * | | | | | | | | | | | | | | | Format the time string according to the precision of the time columnRyuta Kamizono2015-02-207-22/+45
| * | | | | | | | | | | | | | | | Allow `:precision` option for time type columnsRyuta Kamizono2015-02-208-14/+89
* | | | | | | | | | | | | | | | | Merge pull request #18665 from sgrif/sg-test-route-allSean Griffin2015-02-202-8/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Allow `method: "all"` as a valid routing test optionSean Griffin2015-01-232-8/+36
* | | | | | | | | | | | | | | | | | Merge pull request #17144 from skojin/patch-doc-validation-format-z-regexpRafael Mendonça França2015-02-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | fix mistype in doc about \z regexpSergey Kojin2014-10-021-1/+1
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Use a name that better reflect the return valueRafael Mendonça França2015-02-201-2/+2
* | | | | | | | | | | | | | | | | | Merge pull request #17138 from jpcody/rename_default_form_builderRafael Mendonça França2015-02-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Rename default_form_builder to avoid collisionJoshua Cody2014-10-011-2/+2
* | | | | | | | | | | | | | | | | | | Merge pull request #19012 from LeandroSNunes/api_select_tagRafael Mendonça França2015-02-201-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Corrects the API to method select_tagLeandro Nunes2015-02-201-2/+1
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #19013 from y-yagi/custom_validators_exampleAbdelkader Boudih2015-02-203-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | use `messages` instead of deprecated `ActiveModel::Errors#[]=` method [ci skip]yuuji.yaginuma2015-02-203-3/+3
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #19007 from evanphx/route_proxyRafael Mendonça França2015-02-193-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Make the helpers a required argumentEvan Phoenix2015-02-192-3/+3
| * | | | | | | | | | | | | | | | | | Cache url_helpers instead of creating each timeEvan Phoenix2015-02-192-5/+8
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #19005 from meganemura/remove-last-empty-line-in-gemfileRafael Mendonça França2015-02-192-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Remove last empty line when we don't use Windows or JRubymeganemura2015-02-202-2/+2
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #19004 from danieldevries/fix-migration-fieldname-in-exampleAbdelkader Boudih2015-02-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | fix column name in migration example [ci skip]Daniël de Vries2015-02-191-1/+1
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #19002 from bdewater/patch-1Abdelkader Boudih2015-02-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix code sample for custom exception handler [ci skip]Bart2015-02-191-2/+2
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #18996 from morgoth/deprecate-more-errors-methodsYves Senn2015-02-196-10/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Deprecate `ActiveModel::Errors` `add_on_empty` and `add_on_blank` methodsWojciech Wnętrzak2015-02-196-10/+43
* | | | | | | | | | | | | | | | | | | Merge pull request #18916 from kamipo/handle_array_option_in_type_to_sqlRafael Mendonça França2015-02-193-37/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Handle array option in `type_to_sql`Ryuta Kamizono2015-02-191-19/+16
| * | | | | | | | | | | | | | | | | | | Use `delegate` to call the methods to `@conn`Ryuta Kamizono2015-02-191-16/+3
| * | | | | | | | | | | | | | | | | | | Should handle array option for `:cast_as`Ryuta Kamizono2015-02-192-4/+15
* | | | | | | | | | | | | | | | | | | | Merge pull request #18979 from kamipo/extract_precision_from_datetime_and_tim...Rafael Mendonça França2015-02-193-8/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Extract precision from datetime and time columnsRyuta Kamizono2015-02-193-8/+5
* | | | | | | | | | | | | | | | | | | | | Do not mutate the operations arrayRafael Mendonça França2015-02-191-1/+1
* | | | | | | | | | | | | | | | | | | | | Return true instead of self when suppressedRafael Mendonça França2015-02-191-1/+1
* | | | | | | | | | | | | | | | | | | | | Copy edit the suppressor documentationRafael Mendonça França2015-02-193-29/+28
* | | | | | | | | | | | | | | | | | | | | Merge pull request #18910 from perceptec/add_suppressorRafael Mendonça França2015-02-198-0/+118
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add `ActiveRecord::Base.suppress`Michael Ryan2015-02-188-0/+118
* | | | | | | | | | | | | | | | | | | | | Merge pull request #18994 from tgxworld/run_delete_middleware_operations_lastGuillermo Iguaran2015-02-193-2/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Allow Rack::Runtime to be deleted from middleware stack.Guo Xiang Tan2015-02-193-2/+28
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #18999 from simi/remove-unused-gsub_app_fileGuillermo Iguaran2015-02-181-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Remove unused gsub_app_file method from Bukkit.Josef Šimánek2015-02-191-6/+0
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Freeze strings to reduce allocations in integration testseileencodes2015-02-181-4/+8
* | | | | | | | | | | | | | | | | | | | | Reduce the number of times `#clean_path_info` is calledeileencodes2015-02-181-3/+2
| |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #18956 from hjoo/time_optionEileen M. Uchitelle2015-02-183-6/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Add `time` option to `#touch`Hyonjee Joo2015-02-183-6/+34
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Try only to decode stringsRafael Mendonça França2015-02-181-2/+4
* | | | | | | | | | | | | | | | | | | | Merge pull request #18917 from lautis/non-string-csrf-tokenRafael Mendonça França2015-02-183-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Handle non-string authenticity tokensVille Lautanala2015-02-123-1/+13