aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add explanation about accepts_nested_attributes_for keys in the strong parame...Bart de Water2016-03-121-2/+3
* Merge pull request #24163 from prathamesh-sonpatki/fix-gemfile-lockRafael França2016-03-121-1/+1
|\
| * Fix Gemfile.lockPrathamesh Sonpatki2016-03-121-1/+1
|/
* Merge pull request #24161 from Sen-Zhang/restore_application_mailerRafael França2016-03-113-0/+16
|\
| * improve some codeSen-Zhang2016-03-111-2/+4
| * generate application_mailer.rb if it is missingSen-Zhang2016-03-113-0/+14
|/
* AC: skip PG adapter tests if the db isn't availableJeremy Daer2016-03-111-0/+7
* Merge pull request #23797 from kamipo/case_sensitive_comparison_for_non_strin...Rafael França2016-03-113-3/+13
|\
| * The BINARY Operator is only needed for string columnsRyuta Kamizono2016-02-223-3/+13
* | Break up a circular require between AP/AVSean Griffin2016-03-114-5/+6
* | Merge pull request #24155 from chrisarcand/clarify-has-many-dependent-optionJon Moss2016-03-111-9/+7
|\ \
| * | Clarify has_many :dependent option docs [ci skip]Chris Arcand2016-03-111-9/+7
* | | Ping the resque version while we can't investigate the failureRafael Mendonça França2016-03-111-1/+1
* | | Use the most highest priority exception handler when cause is setSean Griffin2016-03-113-2/+49
* | | Fix test failures caused by #23958Sean Griffin2016-03-111-1/+1
* | | Merge pull request #22854 from jcoyne/missing_templateSean Griffin2016-03-113-1/+23
|\ \ \
| * | | Render default template if block doesn't renderJustin Coyne2016-02-253-1/+23
* | | | Merge pull request #24150 from exviva/unmarshal-infinite-retryXavier Noria2016-03-113-1/+20
|\ \ \ \
| * | | | Prevent `Marshal.load` from looping infinitelyOlek Janiszewski2016-03-113-1/+20
* | | | | Merge pull request #24143 from perceptec/fix-thread-mattr-accessor-refsMatthew Draper2016-03-122-2/+8
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix `thread_mattr_accessor` thread-local variable namingMichael Ryan2016-03-112-2/+8
| |/ / /
* | | | Merge pull request #24054 from kamipo/extract_default_primary_keyRafael França2016-03-115-22/+22
|\ \ \ \
| * | | | Extract `default_primary_key?` to refactor `column_spec_for_primary_key`Ryuta Kamizono2016-03-115-22/+22
| |/ / /
* | | | Merge pull request #24087 from kamipo/dump_bigint_instead_of_integer_limit_8Rafael França2016-03-114-13/+13
|\ \ \ \
| * | | | Dump `bigint` instead of `integer` with `limit: 8` for schema dumperRyuta Kamizono2016-03-114-13/+13
| |/ / /
* | | | Merge pull request #23677 from kamipo/passing_table_name_to_column_initializeRafael França2016-03-119-29/+58
|\ \ \ \
| * | | | Passing `table_name` to `Column#initialize` to avoid `instance_variable_set`Ryuta Kamizono2016-03-085-17/+11
| * | | | Initialize `column.table_name` immediately for `column.serial?` correctly wor...Ryuta Kamizono2016-03-088-21/+56
* | | | | Merge pull request #24153 from y-yagi/use_activesupport_reloaderKasper Timm Hansen2016-03-111-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | use `ActiveSupport::Reloader.to_prepare` instead of deprecated `ActionDispatc...yuuji.yaginuma2016-03-111-1/+1
|/ / / /
* | | | Merge pull request #23958 from kamipo/fix_bigserial_appears_with_limit_8Rafael França2016-03-112-2/+6
|\ \ \ \
| * | | | Fix bigserial appears with limit 8 for schema dumperRyuta Kamizono2016-03-042-2/+6
* | | | | Merge pull request #24129 from dharamgollapudi/rename_dependencies_rakeRafael França2016-03-112-1/+1
|\ \ \ \ \
| * | | | | Rename dependencies.rake to cache_digests.rakeDharam Gollapudi2016-03-092-1/+1
* | | | | | Add missing require to tryRafael Mendonça França2016-03-111-0/+2
* | | | | | Merge pull request #24145 from bdewater/remove_try_requireRafael França2016-03-111-1/+0
|\ \ \ \ \ \
| * | | | | | Remove unused try requireBart de Water2016-03-101-1/+0
* | | | | | | Remove unfinished command infrastructure.Kasper Timm Hansen2016-03-102-72/+2
|/ / / / / /
* | | | | | Fix Gemfile.lockRafael Mendonça França2016-03-101-5/+4
* | | | | | Merge pull request #24144 from tjschuck/bcrypt_on_windows_fixedRafael França2016-03-101-7/+1
|\ \ \ \ \ \
| * | | | | | Version 3.1.11 works on Windows againT.J. Schuck2016-03-101-7/+1
|/ / / / / /
* | | | | | Merge pull request #24140 from gregmolnar/guidesVipul A M2016-03-101-5/+3
|\ \ \ \ \ \
| * | | | | | remove obsolete i18n links from guides [ci skip]Greg Molnar2016-03-101-5/+3
|/ / / / / /
* | | | | | Merge pull request #24137 from sidonath/patch-1Rafael França2016-03-101-3/+3
|\ \ \ \ \ \
| * | | | | | [skip ci] Reorder paragraphsDamir2016-03-101-3/+3
|/ / / / / /
* | | | | | Merge pull request #24134 from kamipo/remove_needless_breakRafael França2016-03-101-1/+0
|\ \ \ \ \ \
| * | | | | | Remove needless `break;` [ci skip]Ryuta Kamizono2016-03-101-1/+0
* | | | | | | Merge pull request #24136 from salmanasiddiqui/patch-1प्रथमेश Sonpatki2016-03-101-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fixed comments of add_foreign_key methodSalman Afzal Siddiqui2016-03-101-2/+2
|/ / / / / / /
* | | | | | | revises whitespace in the gemspec of AV [ci skip]Xavier Noria2016-03-101-4/+4