aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #23008 from tawan/avoid-multiple-default-pathsEileen M. Uchitelle2016-01-162-1/+12
|\ \ \ \ \ | | | | | | | | | | | | Avoid multiple default paths to server.pid file
| * | | | | Avoid multiple default paths to server.pid fileTawan Sierek2016-01-162-1/+12
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug (#22811) that occurs when rails server is started in daemon mode and optional path to the `server.pid` file is omitted. Store default path in a constant instead of evaluating it multiple time using `File.expand_path`. The bug in detail: The server startup procedure crashes, since it tries to open a file at `/tmp/pids/server.pid` instead of `<path to project>/tmp/pids/server.pid`. This bug was introduced in 51211a94bd when Rack was upgraded from version 1.x to 2.x. Since version 2.x, Rack does not memoize the options hash [1], and as a consequence `Rails::Server#default_options` will be evaluated multiple times. The hash returned by `Rails::Server#default_options` holds the default path to the `server.pid` file. The path is generated with the method `File.expand_path`. However, the return value of this method depends on the current working directory [2], which changes once `Process.daemon` is invoked by `Rack::Server#daemonize_app` and the process is detached from the current shell. Close #22811 [1]https://git.io/vzen2 [2]http://ruby-doc.org/core-2.1.5/File.html#method-c-expand_path
* | | | | Fix the updated API (this sorts the concurrent-ruby switch with Basecamp)David Heinemeier Hansson2016-01-161-1/+1
| | | | |
* | | | | Revert "Merge pull request #22977 from rails/revert-22934-master"David Heinemeier Hansson2016-01-1615-36/+46
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d0393fccffc118a5de37654aa222774b66123393, reversing changes made to 3b7ccadfc1c8dfec61af898167e1300b17f5cf25.
* | | | | Merge pull request #20046 from yoongkang/ladidaRafael Mendonça França2016-01-163-1/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Use ActiveSupport::SafeBuffer when flushing content_for
| * | | | | Use ActiveSupport::SafeBuffer when flushing content_forYoong Kang Lim2015-05-253-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, when content_for is flushed, the content was replaced directly by a new value in ActionView::OutputFlow#set. The problem is this new value passed to the method may not be an instance of ActiveSupport::SafeBuffer. This change forces the value to be set to a new instance of ActiveSupport::SafeBuffer.
* | | | | | Merge pull request #20005 from kamipo/default_expression_supportRafael França2016-01-1611-44/+100
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add `:expression` option support on the schema default
| * | | | | | Fix extract default with CURRENT_TIMESTUMPRyuta Kamizono2016-01-133-2/+24
| | | | | | |
| * | | | | | Fix extract default with CURRENT_DATERyuta Kamizono2016-01-131-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The default 'now'::date is CURRENT_DATE.
| * | | | | | Add expression support on the schema defaultRyuta Kamizono2016-01-138-39/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: create_table :posts do |t| t.datetime :published_at, default: -> { 'NOW()' } end
* | | | | | | Merge pull request #22985 from akshay-vishnoi/fix-typoRafael França2016-01-161-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | test `include?`- fix typo
| * | | | | | | test `include?`- fix typoAkshay Vishnoi2016-01-091-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #23067 from ↵Rafael França2016-01-163-24/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/sql_for_insert_returns_values_for_passing_to_exec_insert `sql_for_insert` returns values for passing to `exec_insert`
| * | | | | | | | `sql_for_insert` returns values for passing to `exec_insert`Ryuta Kamizono2016-01-153-24/+16
| | | | | | | | |
* | | | | | | | | Merge pull request #23079 from y-yagi/fix_log_clear_exampleRafael França2016-01-161-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | remove unnecessary `ENV[]` from `log:clear` example [ci skip]
| * | | | | | | | | remove unnecessary `ENV[]` from `log:clear` example [ci skip]yuuji.yaginuma2016-01-161-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23060 from ↵Richard Schneeman2016-01-152-19/+59
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | schneems/schneems/revert-revert-migration-set-environment Revert "Revert "Set environment even when no migration runs""
| * | | | | | | | | Fix intermittent test failuresschneems2016-01-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 😳
| * | | | | | | | | Revert "Revert "Set environment even when no migration runs""schneems2016-01-142-19/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 11e85b91731ca6125ee1db33553f984549a3bc2b.
* | | | | | | | | | Merge pull request #22278 from poporul/masterGodfrey Chan2016-01-152-6/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Allow to store .keep file in cache directory
| * | | | | | | | | | Allow to store .keep file in cache directoryAlexey Pokhozhaev2015-11-132-6/+14
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #23071 from ↵Jon Moss2016-01-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | khundawg/dave_moore/update-docs-ActionCable__Connection__Identification.class_methods [ci skip] Fix typo in docs
| * | | | | | | | | | | [ci skip] Fix typo in docsDAVID MOORE2016-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found this small omission while reviewing the ActionCable docs. [Dave Moore]
* | | | | | | | | | | | Merge pull request #23065 from kamipo/clean_up_internal_metadata_definitionRichard Schneeman2016-01-152-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Clean up internal metadata definition
| * | | | | | | | | | | Clean up internal metadata definitionRyuta Kamizono2016-01-152-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `t.index` in `create_table` instead of `add_index` It is slightly more efficient. Revert "Use `key` as primary key in schema." This reverts commit 350ae6cdc1ea83e21c23abd10e7e99c9a0bbdbd2. `:primary_key` option does nothing if `id: false`. https://github.com/rails/rails/blob/v5.0.0.beta1/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb#L251-L261
* | | | | | | | | | | | Merge pull request #23068 from kamipo/remove_unused_last_insert_id_valueSean Griffin2016-01-151-9/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | `last_insert_id_value` and `last_insert_id` are unused anymore
| * | | | | | | | | | | `last_insert_id_value` and `last_insert_id` are unused anymoreRyuta Kamizono2016-01-151-9/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods are private and unused from anywhere.
* | | | | | | | | | | Merge pull request #23014 from jonatack/improve-generated-config-filesRafael França2016-01-152-4/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve generated config initializer files
| * | | | | | | | | | | Improve generated config initializer filesJon Atack2016-01-132-4/+6
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix grammar. - Improve readability/understanding. - Wrap lines at 80 characters. [skip ci]
* | | | | | | | | | | Merge pull request #23052 from kamipo/update_deprecation_horizonRafael França2016-01-151-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | Update deprecation_horizon to 5.1 from 5.0 [ci skip]
| * | | | | | | | | | Update deprecation_horizon to 5.1 from 5.0 [ci skip]Ryuta Kamizono2016-01-141-3/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #23059 from ↵Sean Griffin2016-01-142-58/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rails/revert-23017-schneems/migration-sets-environment-value Revert "Set environment even when no migration runs"
| * | | | | | | | | | | Revert "Set environment even when no migration runs"Sean Griffin2016-01-142-58/+19
|/ / / / / / / / / / /
* | | | | | | | | | | Revert "Merge pull request #20835 from ↵Kasper Timm Hansen2016-01-145-45/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | glittershark/if-and-unless-in-secure-token" This reverts commit 224eddfc0eeff6555ae88691306e61c7a9e8b758, reversing changes made to 9d681fc74c6251d5f2b93fa9576c9b2113116680. When merging the pull request, I misunderstood `has_secure_token` as declaring a model has a token from birth and through the rest of its lifetime. Therefore, supporting conditional creation doesn't make sense. You should never mark a model as having a secure token if there's a time when it shouldn't have it on creation.
* | | | | | | | | | | Merge pull request #23048 from kamipo/substitute_at_is_no_longer_usedSean Griffin2016-01-146-20/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | `substitute_at` is no longer used
| * | | | | | | | | | | `substitute_at` is no longer usedRyuta Kamizono2016-01-146-20/+3
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Arel handles substitution for bind parameters by now.
* | | | | | | | | | | Properly include the `from` clause when merging relationsSean Griffin2016-01-142-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code that set the from clause was removed in bdc5141652770fd227455681cde1f9899f55b0b9. I did not give any reason for doing so. My assumption was that I intended to change it to use the clause objects, but forgot. We appeared to not have test coverage for this case. Fixes #22996
* | | | | | | | | | | Ensure enum scopes work properly with STI and inheritanceSean Griffin2016-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code was changed to call `where` on a specific class in 813c8c07, but no reasoning was given and I can't see any good reason why we would need to do that. This will ensure that the method is called on whatever class the scope is called on. Fixes #23013
* | | | | | | | | | | Merge pull request #23017 from ↵Richard Schneeman2016-01-142-19/+58
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | schneems/schneems/migration-sets-environment-value Set environment even when no migration runs
| * | | | | | | | | | | Set environment even when no migration runsschneems2016-01-112-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR addresses the issue described in https://github.com/rails/rails/pull/22967#issuecomment-170251635. If the database is non empty and has no new migrations than `db:migrate` will not set the environment. This PR works by always setting the environment value on successful `up` migration regardless of whether or not a migration was actually executed.
| * | | | | | | | | | | Clean up duplicate migration logicschneems2016-01-112-18/+21
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #23054 from ankit1910/update-docJon Moss2016-01-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | update doc for << method of has_many association
| * | | | | | | | | | | update doc for << method of has_many associationankit19102016-01-141-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #23056 from ankit1910/fix-typoRafael França2016-01-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | [ci skip] fix typo in docs
| * | | | | | | | | | | [ci skip] fix typo in docsankit19102016-01-141-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #23049 from sevenseacat/patch-1Jon Moss2016-01-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | Fix typo in docs [ci skip]
| * | | | | | | | | | Fix typo in docs [ci skip]Rebecca Skinner2016-01-141-2/+2
|/ / / / / / / / / /
* | / / / / / / / / Space OddityAkira Matsuda2016-01-143-4/+4
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Converting nbsp(\u{00A0}) to the normal ASCII space(\u{0020}) [ci skip]
* | | | | | | | | docs, formatting pass over changelogs. [ci skip]Yves Senn2016-01-134-11/+13
| | | | | | | | |
* | | | | | | | | fix regression when loading fixture files with symbol keys.Yves Senn2016-01-134-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #22584.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 11:11:04 +0000