aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Tiny documentation edits [ci skip]Robin Dupret2015-05-043-17/+20
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * Fix a few typos * Wrap lines to 80 chars * Use `+` instead of `<tt>`
* | | | | Fix railties configuration testAndrew White2015-05-041-2/+2
| | | | |
* | | | | Add support for inline images to mailer previewsAndrew White2015-05-044-9/+64
| | | | | | | | | | | | | | | | | | | | | | | | | Use a preview interceptor to search for inline cid: urls in src attributes and convert them to data urls.
* | | | | Improve display of attachment names in mailer previewsAndrew White2015-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Display attachment filenames as a comma separated list rather than showing the inspect output for the array.
* | | | | Fix mailer previews with attachmentsAndrew White2015-05-044-7/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the mail gem's own API to locate the correct part. Fixes #14435.
* | | | | 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.
| * | | | | Give authentication methods the ability to customize response message.Keenan Brock2015-05-033-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | Digest allowed the messages. Add the same feature to basic and token
* | | | | | Merge pull request #18561 from nerdcave/serialization-methods-optionRafael Mendonça França2015-05-033-10/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | | method_missing fallback for ActiveModel::Serialization methods option
| * | | | | ensure `method_missing` called for non-existing methods passed toJay Elaraj2015-04-283-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | `ActiveModel::Serialization#serializable_hash`
* | | | | | Fix generator testsRafael Mendonça França2015-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | In my machine the output is different
* | | | | | Remove unneeded base fileRafael Mendonça França2015-05-032-57/+53
| | | | | | | | | | | | | | | | | | | | | | | | We are only using for one test class
* | | | | | Remove unused private classesRafael Mendonça França2015-05-032-186/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The usage of these classes where removed at 8017e6af31caa58a58787274ff0ca01397219e49. cc @arthurnn @senny
* | | | | | 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 tests
| * | | | | | 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
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | MySQL does not support partial index. And, the create index algorithm in create table can not be specified.
* | | | | | Merge pull request #19093 from ↵Rafael Mendonça França2015-05-034-3/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | remomueller/fix-actionmailer-preview-links-on-subdirectories Mailer preview now uses `url_for` to fix links to emails for apps runnin...
| * | | | | | Mailer preview now uses `url_for` to fix links to emails for apps running on ↵Remo Mueller2015-04-304-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | a subdirectory, closes #19092.
* | | | | | | Merge pull request #19976 from prathamesh-sonpatki/rm-assignsRafael Mendonça França2015-05-032-5/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Removed `assigns` from functional_test templates
| * | | | | | | Removed `assigns` from functional_test templatesPrathamesh Sonpatki2015-05-022-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Based on DHH's suggestion about deprecating `assigns` in https://github.com/rails/rails/pull/18305#issuecomment-68605166.
* | | | | | | | 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`
| * | | | | | | | Dump indexes in `create_table` instead of `add_index`Ryuta Kamizono2015-05-033-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the adapter supports indexes in create table, generated SQL is slightly more efficient.
* | | | | | | | | Merge pull request #18783 from mikestone14/actionview-image-tag-overrideRafael Mendonça França2015-05-032-0/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Actionview image tag size option override
| * | | | | | | | | image_tag raises an error if size is passed with height and/or widthMike Stone2015-04-242-0/+15
| | | | | | | | | |
* | | | | | | | | | Merge pull request #17824 from ↵Rafael Mendonça França2015-05-034-5/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yuki24/change-record-not-saved-and-not-destroyed-to-include-error-msg AR::RecordNotSaved & RecordNotDestroyed from save!/destroy! should include an error message
| * | | | | | | | | | AR::RecordNotSaved & RecordNotDestroyed should include an error messageYuki Nishijima2015-05-014-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `AR::Base.save!` or `AR::Base.destroy!` is called and an exception is raised, the exception doesn't have any error message or has a weird message like `#<FailedBulb:0x0000000907b4b8>`. Give a better message so we can easily understand why it's failing to save/destroy.
* | | | | | | | | | | Merge pull request #17569 from kamipo/dump_table_optionsRafael Mendonça França2015-05-036-0/+106
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly dump `:options` on `create_table` for MySQL
| * | | | | | | | | | | 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.rb
| * | | | | | | | | | | | 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 columns
| * | | | | | | | | | | | PostgreSQL: `:collation` support for string and text columnsRyuta Kamizono2015-05-044-3/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: create_table :foos do |t| t.string :string_en, collation: 'en_US.UTF-8' t.text :text_ja, collation: 'ja_JP.UTF-8' end
| * | | | | | | | | | | | Move the collation handling code from the MySQL adapter to common classesRyuta Kamizono2015-05-047-29/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some databases like MySQL allow defining collation charset for specific columns.
* | | | | | | | | | | | | 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]
| * | | | | | | | | | | | | 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 rubyo...
| * | | | | | | | | | | | | Changed 'ask the rubyonrails-talk mailing list.' to 'ask it on the ↵Tushar Maroo2015-05-031-1/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rubyonrails-talk mailing list.'
* | | | | | | | | | | | | 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 API
| * | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #19498
* | | | | | | | | | | | | Disable warnings on activejob testsRafael Mendonça França2015-05-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementations seems to not be interested to remove the warnings so enabling them we are just making harder to read the outputs
* | | | | | | | | | | | | Merge pull request #19972 from ↵Rafael Mendonça França2015-05-031-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | robertjlooby/document_habtm_changes_in_upgrade_guide add upgrade note for breaking habtm change in 3.2 -> 4.0
| * | | | | | | | | | | | | 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
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The has_and_belongs_to_many default join_table behavior changed between Rails 3.2 and Rails 4.0 and should be noted in the appropriate section of the upgrade guide. commit: https://github.com/rails/rails/commit/46492949b8c09f99db78b9f7a02d039e7bc6a702
* | | | | | | | | | | | | Merge pull request #19498 from chanks/activejob-que-remove-named-queuesRafael Mendonça França2015-05-032-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveJob: Stop using Que's named queues.
| * | | | | | | | | | | | | 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]
| * | | | | | | | | | | | | 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]
| * | | | | | | | | | | | Move comment about microseconds [ci skip]Ryuta Kamizono2015-05-032-2/+3
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The microseconds handling was already moved to `Quoting#quoted_date`.
* | | | | | | | | | | | Merge pull request #19990 from kamipo/mysql2-0.3.18Santiago Pastorino2015-05-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | gem 'mysql2', '~> 0.3.18'