aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge pull request #22903 from ↵Rafael França2016-01-073-2/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/allow-ac-parameters-hash-as-an-argument-to-routes Allow AC::Parameters as an argument to url_helpers
| * | | | | | | | | | | | Allow AC::Parameters as an argument to url_helpersPrathamesh Sonpatki2016-01-073-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Earlier only Hash was allowed as params argument to url_helpers. - Now ActionController::Parameters instances will also be allowed. - If the params are not secured then it will raise an ArgumentError to indicate that constructing URLs with non-secure params is not recommended. - Fixes #22832.
* | | | | | | | | | | | | Merge pull request #22954 from yui-knk/suppress_warning_on_action_viewRafael França2016-01-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Suppress warning (instance variable @persisted not initialized)
| * | | | | | | | | | | | Suppress warning (instance variable @persisted not initialized)yui-knk2016-01-071-0/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #22952 from Baron-burton/contributing_documentationRafael França2016-01-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Typo in Contributing.md documentation
| * | | | | | | | | | | | Typo in Contributing.md documentationBaron-burton2016-01-061-1/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just fixed a small typo in the documentation.
* | | | | | | | | | | | Merge pull request #22948 from kamipo/remove_delete_sql_in_sqlite3_adapterRafael França2016-01-061-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Remove `delete_sql` in sqlite3 adapter
| * | | | | | | | | | | Remove `delete_sql` in sqlite3 adapterRyuta Kamizono2016-01-071-5/+0
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `sql += " WHERE 1=1"` was introduced in 69cb942. But it is not needed. ref https://www.sqlite.org/lang_delete.html
* | | | | | | | | | | Merge pull request #22945 from kamipo/refactor_connection_insert_sqlRafael França2016-01-064-35/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor `connection.insert_sql`
| * | | | | | | | | | | Refactor `connection.insert_sql`Ryuta Kamizono2016-01-074-35/+10
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `connection.insert_sql` is almost the same as `connection.insert`.
* | | | | | | | | | | Merge pull request #22933 from schneems/schneems/fix-broadcastRichard Schneeman2016-01-066-50/+48
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [close #22917] Don't output to `STDOUT` twice
| * | | | | | | | | | | Remove unused instance variableschneems2016-01-061-1/+0
| | | | | | | | | | | |
| * | | | | | | | | | | [close #22917] Don't output to `STDOUT` twiceschneems2016-01-064-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `rails console` or `rails server` are used along with a logger set to output to `STDOUT` then the contents will show up twice. This happens because the logger is extended with `ActiveSupportLogger.broadcast` with a destination of STDOUT even if it is already outputting to `STDOUT`. Previously PR #22592 attempted to fix this issue, but it ended up causing NoMethodErrors. A better approach than relying on adding a method and flow control is to inspect the log destination directly. For this `ActiveSupport::Logger.logger_outputs_to?` was introduced ```ruby logger = Logger.new(STDOUT) ActiveSupport::Logger.logger_outputs_to?(logger, STDOUT) # => true ``` To accomplish this we must look inside of an instance variable of standard lib's Logger `@logdev`. There is a related Ruby proposal to expose this method in a standard way: https://bugs.ruby-lang.org/issues/11955
| * | | | | | | | | | | Revert "Add Logger option to disable message broadcasts"schneems2016-01-053-45/+22
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts related commits due to #22917.
* | | | | | | | | | | Merge pull request #22941 from lsylvester/pg-remove-index-legacyMatthew Draper2016-01-072-2/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix remove_index for postgresql when running legacy migrations
| * | | | | | | | | | | fix remove_index for postgresql when running legacy migrationsLachlan Sylvester2016-01-062-2/+19
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #22940 from ↵Matthew Draper2016-01-072-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lsylvester/activemodel-depends-on-builder-but-doesnt-use-it remove activemodel dependency on builder
| * | | | | | | | | | | remove activemodel dependency on builderLachlan Sylvester2016-01-062-3/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #22939 from ↵Rafael França2016-01-063-1/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/make_generated_controller_test_file_work_correctly make generated controller test work correctly
| * | | | | | | | | | | make generated controller test work correctlyyuuji.yaginuma2016-01-063-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the `#file_name` that not consideration for the namespace, if generate a controller with a namespace, not the correct url helper generation, it had become an error to run the test. Modified to generate the correct url helper, even if it is produced a namespace with controller.
* | | | | | | | | | | | Merge pull request #22921 from prathamesh-sonpatki/fix-add-referenceRafael França2016-01-061-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Autoload ReferenceDefinition class in abstract adapter so that it can be used by #add_reference in schema_statements
| * | | | | | | | | | | | Autoload ReferenceDefinition class in abstract adapter so that it can be ↵Prathamesh Sonpatki2016-01-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used by #add_reference in schema_statements - Fixes #22916.
* | | | | | | | | | | | | Merge pull request #21688 from kamipo/add_text_and_blob_shorthand_methodsRafael Mendonça França2016-01-063-10/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add short-hand methods for text and blob types in MySQL
| * | | | | | | | | | | | | Add short-hand methods for text and blob types in MySQLRyuta Kamizono2016-01-053-10/+53
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Pg and Sqlite3, `:text` and `:binary` have variable unlimited length. But in MySQL, these have limited length for each types (ref #21591, #21619). This change adds short-hand methods for each text and blob types. Example: create_table :foos do |t| t.tinyblob :tiny_blob t.mediumblob :medium_blob t.longblob :long_blob t.tinytext :tiny_text t.mediumtext :medium_text t.longtext :long_text end
* | | | | | | | | | | | | Merge pull request #22275 from mastahyeti/per-form-csrfRafael França2016-01-069-18/+253
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per-form CSRF tokens
| * | | | | | | | | | | | | add option for per-form CSRF tokensBen Toews2016-01-049-18/+253
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #22938 from sblackstone/masterRafael França2016-01-062-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a better error message if a user mistypes the name of script …
| * | | | | | | | | | | | | | Provide a better error message if a user mistypes the name of script with runnerStephen Blackstone2016-01-052-1/+17
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for detecting bad options for runner
* | | | | | | | | | | | | | Move CHANGELOG entry to Active RecordRafael Mendonça França2016-01-052-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the type definition is in Active Model the change of behavior will be only user facing in Active Record so better to put the entry in its changelog. [ci skip]
* | | | | | | | | | | | | | Merge pull request #20544 from Envek/fix_utc_offset_for_time_attributesRafael França2016-01-053-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take UTC offset into account when assigning string value to time attributes.
| * | | | | | | | | | | | | | Take UTC offset into account when assigning string value to time attribute.Andrey Novikov2016-01-053-1/+9
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #22920 from kamipo/fix_connection_createRafael França2016-01-055-9/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | Fix `connection#create` in PG adapter
| * | | | | | | | | | | | | | Fix `connection#create` in PG adapterRyuta Kamizono2016-01-055-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally `connection#create` had aliased to `connection#insert` in PG adapter. But it was broken by #7447. Re-alias `create` to `insert` for fixing it.
* | | | | | | | | | | | | | | Prefer inspect over escaping and sorround by quote marksSantiago Pastorino2016-01-051-3/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Add Html template handler that wraps Raw output in an OutputBufferSantiago Pastorino2016-01-055-2/+21
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the case when you try to render an html you know safe and the file is named something.html. With this commit the content of the html won't be escaped anymore because AV won't use Raw handler and choose Html handler instead.
* | | | | | | | | | | | | | Merge pull request #22922 from vhf/add_fpb_backClaudio B2016-01-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Update doc/resource link removed by #21211
| * | | | | | | | | | | | | | [ci skip] Update doc/resource link removed by #21211Victor Felder2016-01-051-0/+1
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #22927 from jmgcrespo/jmgcrespo-patch-1Claudio B2016-01-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | [ci skip] Add job suffix to sample's job file name
| * | | | | | | | | | | | | Add job suffix to sample's job file nameManu2016-01-051-2/+2
|/ / / / / / / / / / / / /
* | | / / / / / / / / / / :scissors: Unnecessary spacing in the generated codeAkira Matsuda2016-01-051-1/+1
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #22896 from kamipo/fix_unsigned_and_blob_or_text_columnRafael França2016-01-043-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `unsigned?` and `blob_or_text_column` for Enum columns in MySQL
| * | | | | | | | | | | | Fix `unsigned?` and `blob_or_text_column?` for Enum columns in MySQLRyuta Kamizono2016-01-043-5/+16
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #22906 from bf4/rendering_exceptionsRafael França2016-01-043-88/+163
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ActionController:Renderers test
| * | | | | | | | | | | | | Group related methods togetherBenjamin Fleischer2016-01-031-67/+67
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add ActionController:Renderers testBenjamin Fleischer2016-01-033-24/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To complement actionpack/test/controller/metal/renderers_test.rb
* | | | | | | | | | | | | | Merge pull request #22550 from tamird/record-fetch-warning-allocate-lessSean Griffin2016-01-045-20/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | activerecord: allocate fewer objects
| * | | | | | | | | | | | | activerecord: reuse immutable objectsTamir Duberstein2016-01-044-14/+20
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | activerecord: allocate fewer arrays in `RecordFetchWarning`Tamir Duberstein2016-01-041-6/+4
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #22915 from kamipo/fix_user_name_in_docEileen M. Uchitelle2016-01-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | Fix user name in doc [ci skip]
| * | | | | | | | | | | | Fix user name in doc [ci skip]Ryuta Kamizono2015-12-311-1/+1
| | | | | | | | | | | | |