aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Change 1.week to create 1 week durations instead of 7 days durations."Jeremy Daer2016-04-274-34/+11
| | | | | | Regression: adding minutes/hours to a time would change its time zone This reverts commit 1bf9fe75a6473cb7501cae544cab772713e68cef.
* Merge pull request #24752 from lsylvester/collection_caching-after-set_configsKasper Timm Hansen2016-04-271-1/+1
|\ | | | | Ensure action_controller.cache_store is set up before configuring the collection_cache
| * make the collection_caching initializer run after the Action Controller ↵Lachlan Sylvester2016-04-271-1/+1
|/ | | | configs are setup
* Merge pull request #24747 from Erol/fix-configuration-guide-typoJon Moss2016-04-261-1/+1
|\ | | | | Fix typo in Configuration Guide [ci skip]
| * Fix typo in Configuration Guide [ci skip]Erol Fornoles2016-04-271-1/+1
|/
* Add more info to insecure URL generation errorDerek Prior2016-04-264-4/+12
| | | | | | | | I always appreciate having a bit more information as to why something is now an error. We can use this error to tell people why what they were previously doing is insecure and give them hints on how to fix it. Signed-off-by: Kasper Timm Hansen <kaspth@gmail.com>
* Merge pull request #24723 from lvl0nax/array_split_fixJeremy Daer2016-04-262-10/+14
|\ | | | | | | Little perfomance fix for Array#split.
| * Little perfomance fix for Array#split.lvl0nax2016-04-262-10/+14
| | | | | | | | | | | | | | | | | | Calculating ------------------------------------- before 40.770k i/100ms after 58.464k i/100ms ------------------------------------------------- before 629.568k (± 5.0%) i/s - 3.180M after 1.159M (± 4.5%) i/s - 5.788M
* | Merge pull request #24737 from Erol/fix-guides-typoRichard Schneeman2016-04-261-1/+1
|\ \ | | | | | | Fix typo in Rails Guides [ci skip]
| * | Fix typo in Rails Guides [ci skip]Erol Fornoles2016-04-261-1/+1
|/ /
* | Clear ActionMailer deliveries on setup and teardownarktisklada2016-04-252-1/+42
| | | | | | | | Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | Merge pull request #24641 from rafaelfranca/fix-per-form-token-with-full-urlJeremy Daer2016-04-252-1/+15
|\ \ | | | | | | | | | Discart the schema and host information when building the per-form token
| * | Discart the schema and host information when building the per-form tokenRafael Mendonça França2016-04-202-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the token is generated by the form we were using the schema and host information while only using the path to compare if the action was the same. This was causing the token to be invalid. To fix this we use the same information to generate the token and check it. Fix #24257
* | | Do not cache ActiveSupport::TimeZone#utc_offsetAlexey Shein2016-04-253-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be an issue when TZInfo::TimeZone#current_period is refreshed due to timezone period transition, but it's not reflected in ActiveSupport::TimeZone object. For example, on Sun, 26 Oct 2014 22:00 UTC, Moscow changed its TZ from MSK +04:00 to MSK +03:00 (-1 hour). If ActiveSupport::TimeZone['Moscow'] happens to be initialized just before the timezone transition, it will cache its stale utc_offset even after the timezone transition. This commit removes cache and fixes this issue. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | CI: allow JRuby build to fail, too flaky to be usefulJeremy Daer2016-04-251-0/+1
| | |
* | | Merge pull request #24730 from vipulnsward/move-savepointsRafael França2016-04-252-4/+4
|\ \ \ | | | | | | | | Move remaining current_savepoint_name to savepoints module
| * | | Move remaining current_savepoint_name to savepoints moduleVipul A M2016-04-252-4/+4
| | |/ | |/|
* | | Merge pull request #24731 from vipulnsward/database-typeSean Griffin2016-04-253-1/+16
|\ \ \ | | | | | | | | Change valid_type? from abstract adapter
| * | | Dont simply assume a type is a valid database type. This is only always true ↵Vipul A M2016-04-253-1/+16
| |/ / | | | | | | | | | | | | | | | | | | in the case of sqlite. Others adapters need to perform a check for validity. Add coverage for mysql2 db type validation
* | | Merge pull request #24729 from Fryguy/date_and_time_depends_on_mattr_accessorAndrew White2016-04-251-0/+2
|\ \ \ | |/ / |/| | Add require of mattr_accessor since Compatibility relies on it.
| * | Add require of mattr_accessor since Compatibility relies on it.Jason Frey2016-04-251-0/+2
|/ / | | | | | | | | Follow up to https://github.com/rails/rails/commit/c9c5788a527b70d7f983e2b4b47e3afd863d9f48
* | Merge pull request #24696 from y-yagi/remove_unnessary_option_settingKasper Timm Hansen2016-04-254-5/+24
|\ \ | | | | | | remove unnessary option setting from test runner
| * | register rake options to `OptionParser`yuuji.yaginuma2016-04-252-0/+14
| | | | | | | | | | | | | | | In order to prevent `OptionParser::ParseError` when specify the rake options to `routes` task.
| * | remove unnessary option setting from test runneryuuji.yaginuma2016-04-252-5/+10
| | | | | | | | | | | | | | | | | | | | | If run the test over the `rake` command, because of the test patterns is passed via `rake_run` method, do not need to be obtained from the argv. This probably fixes #24372.
* | | Remove `Array#sum` method before override ityui-knk2016-04-241-0/+2
| | | | | | | | | | | | | | | | | | | | | To suppress warning ('warning: method redefined; discarding old sum') remove the method before override it. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | Merge pull request #23103 from rails/refactor-handling-of-action-defaultJeremy Daer2016-04-248-33/+73
|\ \ \ | | | | | | | | | | | | Refactor handling of :action default in routing
| * | | Refactor handling of :action default in routingAndrew White2016-02-168-32/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The longstanding convention in Rails is that if the :action parameter is missing or nil then it defaults to 'index'. Up until Rails 5.0.0.beta1 this was handled slightly differently than other routing defaults by deleting it from the route options and adding it to the recall parameters. With the recent focus of removing unnecessary duplications this has exposed a problem in this strategy - we are now mutating the request's path parameters and causing problems for later url generation. This will typically affect url_for rather a named url helper since the latter explicitly pass :controller, :action, etc. The fix is to add a default for :action in the route class if the path contains an :action segment and no default is passed. This change also revealed an issue with the parameterized part expiry in that it doesn't follow a right to left order - as soon as a dynamic segment is required then all other segments become required. Fixes #23019.
* | | | Add Expression Indexes and Operator Classes support for PostgreSQLRyuta Kamizono2016-04-2410-38/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: create_table :users do |t| t.string :name t.index 'lower(name) varchar_pattern_ops' end Fixes #19090. Fixes #21765. Fixes #21819. Fixes #24359. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | | remove_index do not fetch indexes if name is specifiedSeva Orlov2016-04-243-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | There is no need to fetch all table indexes in remove_index if name is specified. If name is wrong, then StatementInvalid will be raised. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | | Follow up of #23461Vipul A M2016-04-244-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Rename max to statement_limit - Remove magic number 1000 from everywhere - Defined StatementPool::DEFAULT_STATEMENT_LIMIT and started using it everywhere Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | | rewords code comment [ci skip]Xavier Noria2016-04-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This alternative flows better. [Richard Schneeman & Xavier Noria]
* | | | removes useless use of string interpolationXavier Noria2016-04-241-2/+2
| | | | | | | | | | | | | | | | `railtie` is already a string!
* | | | Include the Savepoints module in all adapters.Vipul A M2016-04-247-17/+10
| | | | | | | | | | | | | | | | | | | | Adapters override `#supports_savepoints?` to return `true` if they support transaction savepoints. Defaults to `false`.
* | | | Share lock: more accurate livelock fix for aa598f4Jeremy Daer2016-04-241-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Awaken waiting threads even if the current thread (the previously exclusive thread) hadn't taken a share lock. This only happens in code that wasn't run within an executor, since that always take an outermost share lock.
* | | | Merge pull request #24715 from vipulnsward/nodoc-st-poolKasper Timm Hansen2016-04-241-1/+1
|\ \ \ \ | | | | | | | | | | :nodoc: internal StatementPool class
| * | | | :nodoc: internal StatementPool class.Vipul A M2016-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #24712 from vipulnsward/23461-release-notesKasper Timm Hansen2016-04-241-3/+8
|\ \ \ \ \ | |/ / / / |/| | | | Add #23461 to release notes
| * | | | Add #23461 to release notesVipul A M2016-04-241-3/+8
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #24710 from prathamesh-sonpatki/fix-buildKasper Timm Hansen2016-04-241-2/+2
|\ \ \ \ | | | | | | | | | | Fix broken build, channel files are also included in `bin/rails stats` now
| * | | | Fix broken build, channel files are also included in `bin/rails stats` nowPrathamesh Sonpatki2016-04-241-2/+2
|/ / / / | | | | | | | | | | | | - Followup of https://github.com/rails/rails/pull/24709.
* | | | Merge pull request #24709 from y-yagi/add_channels_files_in_stats_taskJeremy Daer2016-04-231-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | add channels files in `stats` task
| * | | | add channels files in `stats` taskyuuji.yaginuma2016-04-241-0/+1
| | | | |
* | | | | Merge pull request #23461 from kamipo/prepared_statements_for_mysql2_adapterJeremy Daer2016-04-236-60/+165
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Add prepared statements support for `Mysql2Adapter`
| * | | | Add prepared statements support for `Mysql2Adapter`Ryuta Kamizono2016-04-216-61/+164
| | | | |
* | | | | Merge pull request #24701 from ↵Guillermo Iguaran2016-04-242-8/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/deprecate-request_via_redirect Deprecate `request_via_redirect` method.
| * | | | | Deprecate `request_via_redirect` method.Prathamesh Sonpatki2016-04-242-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/issues/18693. - I think we missed deprecating `request_via_redirect` in that pull request. - Originally requested by DHH here https://github.com/rails/rails/issues/18333.
* | | | | | Merge pull request #24708 from ↵Jeremy Daer2016-04-232-5/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/move_select_rows_implementation_to_super_class Move `select_rows` implementation to super class
| * | | | | | Move `select_rows` implementation to super classRyuta Kamizono2016-04-242-5/+1
| | | | | | |
* | | | | | | Merge pull request #24705 from kamipo/add_nodoc_to_insert_versions_sqlGuillermo Iguaran2016-04-232-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add `:nodoc:` to `insert_versions_sql` [ci skip]
| * | | | | | | Add `:nodoc:` to `insert_versions_sql` [ci skip]Ryuta Kamizono2016-04-242-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Follow up to #24685. `insert_versions_sql` is not public API.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 00:42:52 +0000