aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23121 from prathamesh-sonpatki/fix-testsYves Senn2016-01-191-4/+5
|\ | | | | Fix test failure on PostgreSQL by sorting the result before comparison
| * Fix test failure on PostgreSQL by sorting the result before comparisonPrathamesh Sonpatki2016-01-191-4/+5
|/
* run `type` column through attribtues API type casting.Yves Senn2016-01-193-0/+84
| | | | | | | Closes #21986. This makes it possible to write custom types that define a different mapping for STI columns.
* Merge pull request #23117 from vipulnsward/22297-ar-exception-raiseAbdelkader Boudih2016-01-191-1/+1
|\ | | | | Mention that halting chain does not re-raise `ActiveRecord::RecordIn…
| * Mention that halting chain does not re-raise `ActiveRecord::RecordInvalid` ↵Vipul A M2016-01-191-1/+1
| | | | | | | | | | | | | | | | exception as well, similar to `ActiveRecord::Rollback` Fixes #22297 [ci skip]
* | Merge pull request #23116 from vipulnsward/22648-html-safe-textप्रथमेश Sonpatki2016-01-191-1/+1
|\ \ | | | | | | Make text about render :html option clearer to state, text will get e…
| * | Make text about render :html option clearer to state, text will get escaped ↵Vipul A M2016-01-191-1/+1
| |/ | | | | | | | | | | | | if not marked as safe by using html_safe Fixes #22648 [ci skip]
* | Merge pull request #23114 from ↵Kasper Timm Hansen2016-01-191-2/+2
|\ \ | |/ |/| | | | | y-yagi/refer_to_rails_command_instead_of_rake_in_environment_error refer to rails command instead of rake in environment error
| * refer to rails command instead of rake in environment erroryuuji.yaginuma2016-01-191-2/+2
| | | | | | | | It has been to use an overall rails command in ea4f0e2baba8653b03fba154357842933cf7b778, in order to unify.
* | Merge pull request #23112 from prathamesh-sonpatki/association-guides-fixesKasper Timm Hansen2016-01-191-6/+6
|\ \ | | | | | | Fix discrepancies in associations guide [ci skip]
| * | Fix discrepancies in associations guide [ci skip]Prathamesh Sonpatki2016-01-191-6/+6
|/ / | | | | | | - Followup of https://github.com/rails/rails/commit/71ff088a09d429657877ddfb58985d30df63fc8a
* | Merge pull request #23110 from amitsuroliya/application_recordप्रथमेश Sonpatki2016-01-191-2/+2
|\ \ | |/ |/| `ApplicationRecord` instead of `ActiveRecord::Base` in Association G…
| * `ApplicationRecord` instead of `ActiveRecord::Base` in Association Guides ↵amitkumarsuroliya2016-01-191-2/+2
|/ | | | [ci skip]
* Remove incomplete filter runs all tests in plugins.Kasper Timm Hansen2016-01-181-8/+0
| | | | Forgot to remove it, when I changed the expectations in 88881d2.
* Don't run all tests when files end in a colon.Kasper Timm Hansen2016-01-182-9/+1
| | | | | | | | | | | | | | If running `bin/rails t test/models/bunny_test.rb:` we'd implicitly run all the tests in the bunny test. I now highly doubt that people would ever put in a line filter without a line *and* want that to mean run all tests in that file. Instead, change regex to require a line digit after the colon, so runs without a line at the end would fail to require the test file. This also has the side benefit of breaking requiring a file with many colons: `bin/rails t test/models/bunny_test.rb:::::::::::::4` Think this means I've had enough colonoscopy to last me through the year :)
* Merge pull request #23099 from vipulnsward/change_start_at_end_atKasper Timm Hansen2016-01-185-92/+56
|\ | | | | Changed options for find_each and variants to have options start/finish
| * Changed options for find_each and variants to have options start/finish ↵Vipul A M2016-01-185-92/+56
| | | | | | | | | | | | instead of start_at/end_at based on comments at https://github.com/rails/rails/pull/12257#issuecomment-74688344
* | Merge pull request #23006 from Edouard-chin/code_statistic_ignore_hidde_filesKasper Timm Hansen2016-01-182-2/+15
|\ \ | | | | | | CodeStatistic will now ignore hidden files:
| * | CodeStatistic will now ignore hidden files:Edouard CHIN2016-01-182-2/+15
| | | | | | | | | | | | - Modify the default regex to not match hidden files
* | | Merge pull request #21555 from amitsuroliya/associated_basicsJon Moss2016-01-183-230/+230
|\ \ \ | | | | | | | | Association Guide replaces Order as example with Author-Book Example …
| * | | Association Guide replaces Order as example with Author-Book Example [ci skip]amitkumarsuroliya2016-01-183-230/+230
|/ / / | | | | | | fixes #21500
* | | Merge pull request #22705 from ↵Jon Moss2016-01-181-2/+28
|\ \ \ | | | | | | | | | | | | | | | | RochesterinNYC/add-order-explanation-to-first-last-guides Add clarification about `first` and `last` behavior when using `order` [ci skip]
| * | | Add clarification about `first` and `last` behavior when using `order` [ci skip]James Wen2015-12-201-2/+28
| | | |
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 02:10:36 +0000