Commit Graph

51057 Commits

Author SHA1 Message Date
Andrew White
60239f3e5a Add support for inline images to mailer previews
Use a preview interceptor to search for inline cid: urls in src
attributes and convert them to data urls.
2015-05-04 10:56:59 +01:00
Andrew White
9f39d3126f Improve display of attachment names in mailer previews
Display attachment filenames as a comma separated list rather than
showing the inspect output for the array.
2015-05-04 10:54:51 +01:00
Andrew White
350d272d6c Fix mailer previews with attachments
Use the mail gem's own API to locate the correct part.

Fixes #14435.
2015-05-04 10:54:50 +01:00
Rafael Mendonça França
4261aa575a Merge pull request #19981 from kbrock/custom_auth_html
Give authentication methods the ability to customize response message.
2015-05-03 23:23:03 -03:00
Keenan Brock
ba924a514b Give authentication methods the ability to customize response message.
Digest allowed the messages.
Add the same feature to basic and token
2015-05-03 22:21:19 -04:00
Rafael Mendonça França
12d042ffb3 Merge pull request #18561 from nerdcave/serialization-methods-option
method_missing fallback for ActiveModel::Serialization methods option
2015-05-03 23:02:05 -03:00
Rafael Mendonça França
b67197ee30 Fix generator tests
In my machine the output is different
2015-05-03 21:26:28 -03:00
Rafael Mendonça França
35867c0bee Remove unneeded base file
We are only using for one test class
2015-05-03 21:25:56 -03:00
Rafael Mendonça França
3297909cdc Remove unused private classes
The usage of these classes where removed at
8017e6af31caa58a58787274ff0ca01397219e49.

cc @arthurnn @senny
2015-05-03 21:22:53 -03:00
Rafael Mendonça França
0e7718f958 Merge pull request #20002 from kamipo/more_exercise_create_index_sql_tests
More exercise the create index sql tests
2015-05-03 21:21:03 -03:00
Ryuta Kamizono
f380c29134 More exercise the create index sql tests 2015-05-04 08:22:44 +09:00
Ryuta Kamizono
c8816b4d51 Do not use options that does not support
MySQL does not support partial index. And, the create index algorithm in
create table can not be specified.
2015-05-04 08:22:44 +09:00
Rafael Mendonça França
39b0411ce0 Merge pull request #19093 from remomueller/fix-actionmailer-preview-links-on-subdirectories
Mailer preview now uses `url_for` to fix links to emails for apps runnin...
2015-05-03 20:10:10 -03:00
Rafael Mendonça França
d70d575158 Merge pull request #19976 from prathamesh-sonpatki/rm-assigns
Removed `assigns` from functional_test templates
2015-05-03 19:46:36 -03:00
Rafael Mendonça França
02966105a5 Merge pull request #19994 from kamipo/dump_indexes_in_create_table
Dump indexes in `create_table` instead of `add_index`
2015-05-03 19:33:12 -03:00
Rafael Mendonça França
f17792245f Merge pull request #18783 from mikestone14/actionview-image-tag-override
Actionview image tag size option override
2015-05-03 19:26:43 -03:00
Rafael Mendonça França
a278668624 Merge pull request #17824 from yuki24/change-record-not-saved-and-not-destroyed-to-include-error-msg
AR::RecordNotSaved & RecordNotDestroyed from save!/destroy! should include an error message
2015-05-03 18:50:51 -03:00
Rafael Mendonça França
b6cc44bfa6 Merge pull request #17569 from kamipo/dump_table_options
Correctly dump `:options` on `create_table` for MySQL
2015-05-03 18:43:58 -03:00
Rafael Mendonça França
8847bed3eb Merge pull request #19987 from kamipo/move_postgresql_specific_schema
Move PostgreSQL specific schema to postgresql_specific_schema.rb
2015-05-03 18:39:06 -03:00
Rafael Mendonça França
1515c4d98d Merge pull request #19978 from kamipo/collation_option_support_for_postgresql
PostgreSQL: `:collation` support for string and text columns
2015-05-03 18:32:01 -03:00
Rafael Mendonça França
03b0911cff Merge pull request #19980 from vngrs/use_new_lambda_syntax_in_doc
Use ruby 1.9 lambda syntax in documentations [ci skip]
2015-05-03 18:20:46 -03:00
Rafael Mendonça França
29765e7b02 Merge pull request #19986 from tusharmaroo/my_first_contribution
Changed 'ask the rubyonrails-talk mailing list.' to 'ask it on the rubyo...
2015-05-03 18:16:12 -03:00
Rafael Mendonça França
7a8504d852 Merge pull request #19989 from kamipo/change_visit_addcolumn_visibilty
Change the `visit_AddColumn` visiblity for the internal API
2015-05-03 18:11:26 -03:00
Rafael Mendonça França
5d83d111f5 Do not use named queues for que adapter
See #19498
2015-05-03 18:01:57 -03:00
Rafael Mendonça França
c2e30f8e45 Disable warnings on activejob tests
The implementations seems to not be interested to remove the warnings so
enabling them we are just making harder to read the outputs
2015-05-03 18:01:10 -03:00
Rafael Mendonça França
76feb8b8de Merge pull request #19972 from robertjlooby/document_habtm_changes_in_upgrade_guide
add upgrade note for breaking habtm change in 3.2 -> 4.0
2015-05-03 17:45:35 -03:00
Rafael Mendonça França
b4b29536e5 Merge pull request #19498 from chanks/activejob-que-remove-named-queues
ActiveJob: Stop using Que's named queues.
2015-05-03 17:39:50 -03:00
Rafael Mendonça França
982db48bcb Merge pull request #19999 from kamipo/missing_bigint
Missing `:bigint` [ci skip]
2015-05-03 17:22:30 -03:00
Ryuta Kamizono
243a50d631 Missing :bigint [ci skip] 2015-05-04 04:00:41 +09:00
Ryuta Kamizono
f8e748b4e8 PostgreSQL: :collation support for string and text columns
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
2015-05-04 03:53:41 +09:00
Ryuta Kamizono
446f252100 Move the collation handling code from the MySQL adapter to common classes
Some databases like MySQL allow defining collation charset for specific
columns.
2015-05-04 03:53:41 +09:00
Zachary Scott
8ce44b287f Merge pull request #19988 from kamipo/move_comment_about_microseconds
Move comment about microseconds [ci skip]
2015-05-03 11:07:02 -07:00
Rob Looby
2ffeee3d2a add note about habtm relations with scopes 2015-05-03 11:52:45 -05:00
Santiago Pastorino
71669370ae Merge pull request #19990 from kamipo/mysql2-0.3.18
gem 'mysql2', '~> 0.3.18'
2015-05-03 13:13:10 -03:00
Ryuta Kamizono
40323adbb0 gem 'mysql2', '~> 0.3.18'
Follow up #18914.
2015-05-04 00:25:40 +09:00
Richard Schneeman
eb3380f72e Merge pull request #19991 from mcfiredrill/nodoc-postgresql-change-column
`:nodoc:` postgresql's change_column
2015-05-03 10:16:04 -05:00
Ryuta Kamizono
99801c6a7b Dump indexes in create_table instead of add_index
If the adapter supports indexes in create table, generated SQL is
slightly more efficient.
2015-05-03 23:35:13 +09:00
Tony Miller
16270eac7c :nodoc: postgresql's change_column
Its nodoc'ed for the other implementations, and doc'ed in the base
class, just like the other change_column* methods.
2015-05-03 23:08:36 +09:00
Ryuta Kamizono
cd00526d0b Change the visit_AddColumn visiblity for the internal API 2015-05-03 22:07:26 +09:00
Ryuta Kamizono
e61c32cb38 Move comment about microseconds [ci skip]
The microseconds handling was already moved to `Quoting#quoted_date`.
2015-05-03 21:54:27 +09:00
Ryuta Kamizono
6c8ec48ba3 Move PostgreSQL specific schema to postgresql_specific_schema.rb 2015-05-03 21:13:13 +09:00
Yves Senn
5f844211be Merge pull request #19982 from acapilleri/scope_uniquiness
[ci skip] Uniquiness with scope can have one or more arguments
2015-05-03 13:00:37 +02:00
Yves Senn
347052a50e Merge pull request #19984 from mcfiredrill/nodoc-change-column-null
:nodoc: change_column_null in the implmenting adapters
2015-05-03 12:58:58 +02:00
Yves Senn
4606eccf41 Merge pull request #19983 from kamipo/remove_unused_require
Remove unused require
2015-05-03 12:54:49 +02:00
Tushar Maroo
1711c091e9 Changed 'ask the rubyonrails-talk mailing list.' to 'ask it on the rubyonrails-talk mailing list.' 2015-05-03 16:16:03 +05:30
Tony Miller
cc756ea792 :nodoc: change_column_null in the implmenting adapters
`change_column_null` is doc'ed only in
ActiveRecord::ConnectionAdapters::SchemaStatements, so it would make
sense to :nodoc: it elsewhere.
2015-05-03 17:39:17 +09:00
Ryuta Kamizono
486a3697c9 Remove unused require 2015-05-03 16:54:03 +09:00
Ryuta Kamizono
22ba159efc Correctly dump :options on create_table for MySQL 2015-05-03 16:41:19 +09:00
Angelo Capilleri
5c3be16ed2 [ci skip] Uniquiness with scope can have one or more arguments 2015-05-03 09:11:06 +02:00
Mehmet Emin İNAÇ
e4dd700b5d Use ruby 1.9 lambda syntax in documentations [ci skip] 2015-05-03 02:50:31 +03:00