aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #18839 from yuki24/remove-warning-from-generators-named-ba...Yves Senn2015-02-091-10/+0
|\
| * Remove warning from generator named base testYuki Nishijima2015-02-081-10/+0
* | Merge pull request #18840 from yuki24/remove-warning-from-plugin-generatorYves Senn2015-02-091-3/+3
|\ \ | |/ |/|
| * Remove warning from Plugin GeneratorYuki Nishijima2015-02-081-3/+3
* | Merge pull request #18764 from tsun1215/masterAndrew White2015-02-083-0/+33
|\ \ | |/ |/|
| * Explicitly ignored wildcard verbs from head_routesTerence Sun2015-02-083-0/+33
|/
* Move #18833 changelog to the top [ci skip]Carlos Antonio da Silva2015-02-081-35/+33
* Remove debug codeCarlos Antonio da Silva2015-02-081-5/+0
* Merge pull request #18850 from kamipo/fix_rounding_problem_for_postgresql_tim...Andrew White2015-02-085-19/+50
|\
| * Fix rounding problem for PostgreSQL timestamp columnRyuta Kamizono2015-02-085-19/+50
|/
* Merge pull request #18602 from kamipo/respect_database_charset_and_collationAndrew White2015-02-083-5/+21
|\
| * Respect the database default charset for `schema_migrations` table.Ryuta Kamizono2015-02-083-5/+21
* | Merge pull request #18848 from kamipo/add_auto_increment_methodAndrew White2015-02-082-3/+7
|\ \
| * | Add `auto_increment?` instead of `extra == 'auto_increment'`Ryuta Kamizono2015-02-082-3/+7
| |/
* | Merge pull request #18851 from kamipo/remove_unused_lineAndrew White2015-02-081-1/+0
|\ \
| * | Remove unused lineRyuta Kamizono2015-02-081-1/+0
| |/
* | Merge pull request #18852 from kamipo/missing_atAbdelkader Boudih2015-02-081-1/+1
|\ \ | |/ |/|
| * Missing `@` [ci skip]Ryuta Kamizono2015-02-081-1/+1
|/
* rm `Type#number?`Sean Griffin2015-02-0717-29/+1
* rm `Type#text?`Sean Griffin2015-02-076-14/+29
* Move non-type objects into the `Type::Helpers` namespaceSean Griffin2015-02-0719-104/+110
* rm `ActiveRecord::Type::Decorator`Sean Griffin2015-02-074-28/+0
* Push multi-parameter assignement into the typesSean Griffin2015-02-0712-108/+77
* Merge pull request #18842 from yuki24/simplify-NameError#missing_nameRafael Mendonça França2015-02-071-2/+1
|\
| * NameError#missing_name? can jsut use NameError#name if the arg is a SymbolYuki Nishijima2015-02-071-2/+1
* | Merge pull request #18574 from aditya-kapoor/silent-actionmailer-testsRafael Mendonça França2015-02-071-5/+16
|\ \
| * | remove noise from AM testsAditya Kapoor2015-02-071-5/+16
| |/
* | Merge pull request #18835 from jtmkrueger/masterXavier Noria2015-02-071-0/+0
|\ \ | |/ |/|
| * use rails favicon.ico instead or ruby favicon.ico for rails guidesJohn Krueger2015-02-061-0/+0
* | Merge pull request #14252 from mcfiredrill/make-zones-map-privateArthur Neves2015-02-062-9/+9
|\ \
| * | make zones_map privateTony Miller2015-02-062-9/+9
|/ /
* | Merge pull request #18837 from y-yagi/fix-deprecation-warning-in-render-testArthur Nogueira Neves2015-02-061-2/+2
|\ \ | |/ |/|
| * use kwargs instead of xhr method. refs #18771.yuuji.yaginuma2015-02-071-2/+2
|/
* Add link to the show action in the getting startedRafael Mendonça França2015-02-061-0/+1
* Merge pull request #18834 from mfazekas/fix-i18-for-openstructRafael Mendonça França2015-02-062-1/+13
|\
| * Fixed undefined method `i18n_key' for nil:NilClass for labels in non AR form_forMiklos Fazekas2015-02-062-1/+13
|/
* Document the usage of the default option to attributeSean Griffin2015-02-061-0/+14
* A symbol can be passed to `attribute`, which should be documentedSean Griffin2015-02-061-3/+4
* Grammar and RDoc formattingSean Griffin2015-02-062-35/+37
* Remove reference to the now done documentation.rakeXavier Noria2015-02-061-1/+0
* README.rdoc -> README.md for newly generated applicationsXavier Noria2015-02-065-5/+9
* Remove documentation tasksXavier Noria2015-02-069-121/+5
* Docs pass for the attributes APISean Griffin2015-02-062-39/+154
* Raise ArgumentError when passing nil to Relation#mergeRafael Mendonça França2015-02-063-1/+24
* Stoping using Relation#merge in default_scopedRafael Mendonça França2015-02-061-1/+7
* Merge pull request #18833 from perceptec/add_only_performed_optionRafael Mendonça França2015-02-064-18/+186
|\
| * Add an `:only` option to `perform_enqueued_jobs` to filter jobs based onMichael Ryan2015-02-064-18/+186
|/
* Significantly improve the performance of `_read_attribute` on JRubySean Griffin2015-02-062-4/+21
* Use keyword argument in the find_in_batches APIRafael Mendonça França2015-02-061-11/+7
* Allow a symbol to be passed to `attribute`, in place of a type objectSean Griffin2015-02-0616-22/+148