aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Define `:foreign_type` as a valid option in `SingularAssociation`yui-knk2016-01-193-3/+3
| | | | | `:foreign_type` is a valid option for `belongs_to` and `has_one` so remove this to `SingularAssociation`.
* Merge pull request #23088 from prathamesh-sonpatki/update-gemfile-lockSantiago Pastorino2016-01-181-2/+1
|\ | | | | Checked in changes to Gemfile.lock on latest master
| * Checked in changes to Gemfile.lock on latest masterPrathamesh Sonpatki2016-01-171-2/+1
| | | | | | | | - Eventmachine version gets updated when `bundle` is run locally.
* | Merge pull request #22394 from j-dexx/update_association_basics_guideJon Moss2016-01-181-3/+13
|\ \ | | | | | | Updated the guides for having a distinct has_many through at the data…
| * | Updated the guides for having a distinct has_many through at the database levelJames Doyley2016-01-181-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current example add_index :person_articles, :article, unique: true Does not work, the `:article` column does not exist as it will be a join table (based on the prior example) so should use :article_id The documentation seems to suggest that it will allow an article to be added only once to a person via the join table, what actually occurs is that it only allows the article to be added to one person, at which point it should be a `belongs_to` association. Also changed the new example to use readings based on the prior example
* | | Merge pull request #23096 from HayleyCAnderson/ha-action-cable-docsJon Moss2016-01-181-20/+31
|\ \ \ | | | | | | | | [ci skip] Improve Action Cable configuration explanations
| * | | Improve Action Cable configuration explanationsHayley Anderson2016-01-181-20/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clarify wording around how defaults work * Clarify wording around what formatting versus information is required * Separate consumer configuration section since it is important and wordy * Add additional explanation of options for setting consumer configuration * Consolidate consumer configuration information to reduce confusion
* | | | Merge pull request #23097 from prathamesh-sonpatki/psql-hstoreYves Senn2016-01-181-0/+4
|\ \ \ \ | | | | | | | | | | Explain how HStore columns can be queried [ci skip]
| * | | | Explain how HStore columns can be queried [ci skip]Prathamesh Sonpatki2016-01-181-0/+4
| | | | | | | | | | | | | | | | | | | | - Fixes #22876.
* | | | | Merge pull request #23098 from vipulnsward/changelog-passKasper Timm Hansen2016-01-181-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Pass through AP CHANGELOG
| * | | | Pass through AP CHANGELOG [ci skip]Vipul A M2016-01-181-2/+2
|/ / / /
* | | | Merge pull request #23085 from maclover7/fix-17030Kasper Timm Hansen2016-01-174-4/+4
|\ \ \ \ | | | | | | | | | | Remove AV dependence on AP's Mime
| * | | | Remove ActionView dependence on ActionPack's Mime implementationJon Moss2016-01-174-4/+4
|/ / / /
* | | | Merge pull request #23089 from kaspth/better-template-typesKasper Timm Hansen2016-01-171-15/+14
|\ \ \ \ | |_|_|/ |/| | | Enrich Action View Template types with symbols from Action Dispatch Mime.
| * | | Store the symbols as an array.Kasper Timm Hansen2016-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A Set can't be implicitly converted into an Array: ``` irb(main):012:0> formats = [ :rss ] => [:rss] irb(main):013:0> formats &= SET.symbols TypeError: no implicit conversion of Set into Array from (irb):13:in `&' from (irb):13 from /Users/kasperhansen/.rbenv/versions/2.2.3/bin/irb:11:in `<main>' ``` Besides `Mime::SET.symbols` returns an Array, so we're closer to that.
| * | | Enrich the SET constant to respond to symbols.Kasper Timm Hansen2016-01-171-1/+5
| | | | | | | | | | | | | | | | Match `Mime::SET.symbols`.
| * | | Don't bother looking up the types.Kasper Timm Hansen2016-01-171-3/+3
| | | | | | | | | | | | | | | | If they aren't symbols, then they aren't likely to be in the set anyway.
| * | | Replace class attribute with SET constant.Kasper Timm Hansen2016-01-171-3/+2
| | | | | | | | | | | | | | | | We'll be using this to map over to Action Dispatch's Mime::Set.
| * | | Remove register abstraction.Kasper Timm Hansen2016-01-171-7/+1
| | | | | | | | | | | | | | | | | | | | The template types is a private abstraction to fill in basic blanks from Action Dispatch's mime types. As such we can modify the data structure ourselves.
| * | | Replace delegate calls with standard method defs.Kasper Timm Hansen2016-01-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Spares a to_sym call by aliasing to_sym to ref. Then the delegate felt meager for one method; ditch and define method ourselves.
| * | | Spare to_sym call in `==`.Kasper Timm Hansen2016-01-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The @symbol has already been converted to a symbol in initialize, so no need to call to_sym when comparing it. Ditch early return for a simple unless statement.
| * | | Make ref return the internal symbol.Kasper Timm Hansen2016-01-171-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | We delegate to_sym to the internal symbol, which we've already called to_sym on in initialize, so we don't need to do that. We also know to_sym will never return a falsy value, so we'll never hit to_s. Just return the symbolized symbol.
* | | Remove literal? check to fix issue with prefixed optionalseileencodes2016-01-162-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit d993cb3 `build_path` was changed from using `grep` to `find_all` to save array allocations. This change was a little too aggressive in that when the dash comes before the symbol like `/omg-:song` the symbol is skipped. Removing the check for `n.right.left.literal?` fixes this issue, but does add back some allocations. The number of allocations are still well less than before. I've added a regression test to test this behavior for the future. Fixes #23069. Array allocations as of d993cb3: ``` {:T_SYMBOL=>11} {:T_REGEXP=>17} {:T_STRUCT=>6500} {:T_MATCH=>12004} {:T_OBJECT=>91009} {:T_DATA=>100088} {:T_HASH=>114013} {:T_STRING=>159637} {:T_ARRAY=>321056} {:T_IMEMO=>351133} ``` Array allocations after this change: ``` {:T_SYMBOL=>11} {:T_REGEXP=>1017} {:T_STRUCT=>6500} {:T_MATCH=>12004} {:T_DATA=>84092} {:T_OBJECT=>87009} {:T_HASH=>110015} {:T_STRING=>166152} {:T_ARRAY=>322056} {:T_NODE=>343558} ```
* | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-14 06:26:25 +0000