aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19981 from kbrock/custom_auth_htmlRafael Mendonça França2015-05-033-20/+22
|\
| * Give authentication methods the ability to customize response message.Keenan Brock2015-05-033-20/+22
* | Merge pull request #18561 from nerdcave/serialization-methods-optionRafael Mendonça França2015-05-033-10/+22
|\ \ | |/ |/|
| * ensure `method_missing` called for non-existing methods passed toJay Elaraj2015-04-283-10/+22
* | Fix generator testsRafael Mendonça França2015-05-031-1/+1
* | Remove unneeded base fileRafael Mendonça França2015-05-032-57/+53
* | Remove unused private classesRafael Mendonça França2015-05-032-186/+0
* | Merge pull request #20002 from kamipo/more_exercise_create_index_sql_testsRafael Mendonça França2015-05-034-8/+83
|\ \
| * | More exercise the create index sql testsRyuta Kamizono2015-05-044-4/+79
| * | Do not use options that does not supportRyuta Kamizono2015-05-041-4/+4
|/ /
* | Merge pull request #19093 from remomueller/fix-actionmailer-preview-links-on-...Rafael Mendonça França2015-05-034-3/+38
|\ \
| * | Mailer preview now uses `url_for` to fix links to emails for apps running on ...Remo Mueller2015-04-304-3/+38
* | | Merge pull request #19976 from prathamesh-sonpatki/rm-assignsRafael Mendonça França2015-05-032-5/+4
|\ \ \
| * | | Removed `assigns` from functional_test templatesPrathamesh Sonpatki2015-05-022-5/+4
* | | | Merge pull request #19994 from kamipo/dump_indexes_in_create_tableRafael Mendonça França2015-05-033-16/+21
|\ \ \ \
| * | | | Dump indexes in `create_table` instead of `add_index`Ryuta Kamizono2015-05-033-16/+21
* | | | | Merge pull request #18783 from mikestone14/actionview-image-tag-overrideRafael Mendonça França2015-05-032-0/+15
|\ \ \ \ \
| * | | | | image_tag raises an error if size is passed with height and/or widthMike Stone2015-04-242-0/+15
* | | | | | Merge pull request #17824 from yuki24/change-record-not-saved-and-not-destroy...Rafael Mendonça França2015-05-034-5/+8
|\ \ \ \ \ \
| * | | | | | AR::RecordNotSaved & RecordNotDestroyed should include an error messageYuki Nishijima2015-05-014-5/+8
* | | | | | | Merge pull request #17569 from kamipo/dump_table_optionsRafael Mendonça França2015-05-036-0/+106
|\ \ \ \ \ \ \
| * | | | | | | Correctly dump `:options` on `create_table` for MySQLRyuta Kamizono2015-05-036-0/+106
* | | | | | | | Merge pull request #19987 from kamipo/move_postgresql_specific_schemaRafael Mendonça França2015-05-032-14/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Move PostgreSQL specific schema to postgresql_specific_schema.rbRyuta Kamizono2015-05-032-14/+11
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #19978 from kamipo/collation_option_support_for_postgresqlRafael Mendonça França2015-05-0310-32/+116
|\ \ \ \ \ \ \ \
| * | | | | | | | PostgreSQL: `:collation` support for string and text columnsRyuta Kamizono2015-05-044-3/+79
| * | | | | | | | Move the collation handling code from the MySQL adapter to common classesRyuta Kamizono2015-05-047-29/+37
* | | | | | | | | Merge pull request #19980 from vngrs/use_new_lambda_syntax_in_docRafael Mendonça França2015-05-034-7/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use ruby 1.9 lambda syntax in documentations [ci skip]Mehmet Emin İNAÇ2015-05-034-7/+7
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #19986 from tusharmaroo/my_first_contributionRafael Mendonça França2015-05-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Changed 'ask the rubyonrails-talk mailing list.' to 'ask it on the rubyonrail...Tushar Maroo2015-05-031-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #19989 from kamipo/change_visit_addcolumn_visibiltyRafael Mendonça França2015-05-033-11/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change the `visit_AddColumn` visiblity for the internal APIRyuta Kamizono2015-05-033-11/+14
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Do not use named queues for que adapterRafael Mendonça França2015-05-032-2/+2
* | | | | | | | | Disable warnings on activejob testsRafael Mendonça França2015-05-031-2/+2
* | | | | | | | | Merge pull request #19972 from robertjlooby/document_habtm_changes_in_upgrade...Rafael Mendonça França2015-05-031-0/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add note about habtm relations with scopesRob Looby2015-05-031-0/+2
| * | | | | | | | | add upgrade note for breaking habtm change in 3.2 -> 4.0Rob Looby2015-05-011-0/+12
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #19498 from chanks/activejob-que-remove-named-queuesRafael Mendonça França2015-05-032-3/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Stop using Que's named queues in its ActiveJob adapter.Chris Hanks2015-03-242-3/+7
* | | | | | | | | | Merge pull request #19999 from kamipo/missing_bigintRafael Mendonça França2015-05-031-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Missing `:bigint` [ci skip]Ryuta Kamizono2015-05-041-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #19988 from kamipo/move_comment_about_microsecondsZachary Scott2015-05-032-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move comment about microseconds [ci skip]Ryuta Kamizono2015-05-032-2/+3
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #19990 from kamipo/mysql2-0.3.18Santiago Pastorino2015-05-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gem 'mysql2', '~> 0.3.18'Ryuta Kamizono2015-05-041-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #19991 from mcfiredrill/nodoc-postgresql-change-columnRichard Schneeman2015-05-031-2/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | `:nodoc:` postgresql's change_columnTony Miller2015-05-031-2/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #19982 from acapilleri/scope_uniquinessYves Senn2015-05-031-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] Uniquiness with scope can have one or more argumentsAngelo Capilleri2015-05-031-1/+1
| | |/ / / / / / | |/| | | | | |