aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix regression in #20017: wrong number of arguments errorJon Atack2015-05-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and use coherent quoting/spacing. This should hopefully fix a regression that was introduced with #20017, causing deployment pushes to Heroku to be rejected with the following trace: ArgumentError: wrong number of arguments (2 for 3) remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tatic.rb:16:in `initialize' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/gem s/heroku-deflater-0.5.3/lib/heroku-deflater/serve_zipped_assets.rb:15:in `new' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/gem s/heroku-deflater-0.5.3/lib/heroku-deflater/serve_zipped_assets.rb:15:in `initialize' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:43:in `new' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:43:in `build' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:118:in `block in build' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:118:in `each' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:118:in `inject' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:118:in `build' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/engine.rb:509:in `app' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/application/finisher.rb: 34:in `block in <module:Finisher>' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:30:in `instance_exec' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:30:in `run' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:55:in `block in run_initializers' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:54:in `run_initializers' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/application.rb:352:in `initialize!' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/config/environment.rb:5:in `<top (required)>'
* Ensure symbols passed to `select` are always quotedSean Griffin2015-05-304-10/+37
| | | | | | | | | | | | | | | | | Our general contract in Active Record is that strings are assumed to be SQL literals, and symbols are assumed to reference a column. If a from clause is given, we shouldn't include the table name, but we should still quote the value as if it were a column. Upon fixing this, the tests were still failing on SQLite. This was because the column name being returned by the query was `"\"join\""` instead of `"join"`. This is actually a bug in SQLite that was fixed a long time ago, but I was using the version of SQLite included by OS X which has this bug. Since I'm guessing this will be a common case for contributors, I also added an explicit check with a more helpful error message. Fixes #20360
* Add docs and changelog entry for 73aab03 [ci skip]Sean Griffin2015-05-302-1/+15
|
* Merge pull request #20380 from kamipo/add_changelog_for_17654Eileen M. Uchitelle2015-05-301-0/+13
|\ | | | | Add CHANGELOG entry for #17654
| * Add CHANGELOG entry for #17654 [ci skip]Ryuta Kamizono2015-05-301-0/+13
|/
* Merge pull request #20378 from vngrs/fix_doc_of_match_methodKasper Timm Hansen2015-05-301-3/+6
|\ | | | | match method doc fix [ci skip]
| * match method doc fix [ci skip]Mehmet Emin İNAÇ2015-05-301-3/+6
|/ | | | | | match method without setting `:via` option has been deprecated fix minor typo
* Merge pull request #20375 from yoongkang/docfixClaudio B.2015-05-301-1/+1
|\ | | | | [ci skip] match without via is now deprecated
| * [ci skip] match without via is now deprecatedYoong Kang Lim2015-05-301-1/+1
| |
* | Merge pull request #20370 from manishspuri/masterGodfrey Chan2015-05-308-4/+56
|\ \ | |/ |/| | | Add tmp directory before touching
| * Add test to ensure tmp:clear works when tmp is missingYoong Kang Lim2015-05-301-0/+7
| | | | | | | | See #20299.
| * Generate a `.keep` file in `tmp` folderYoong Kang Lim2015-05-304-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | A lot of scripts assumes the existence of this folder and most would fail if it is absent. One example of this is `rake restart` (before the previous commit) – it tries to `touch tmp/restart.txt`, which would fail if `tmp` does not exist, which was the case for a freshly-cloned project as `tmp` is `.gitignored` by default. See #20299. [Yoong Kang Lim, Sunny Juneja]
| * `rake restart` should work without a `tmp` folderYoong Kang Lim2015-05-303-3/+12
|/ | | | | | | | | | | | | In restart.rake, the creation of tmp/restart.txt would fail if the tmp folder does not exist in the app. This is a problem because apps cloned using git would not have the tmp folder, as the folder is in .gitignore. This commit creates the tmp folder if it does not exist. Fixes #20299 [Yoong Kang Lim, Sunny Juneja]
* Require yaml for isolation testRafael Mendonça França2015-05-291-0/+1
| | | | | It was removed when we removed mocha at 5a6ae7f7539216931f2b3f4aa53394ac4136c74e
* Merge pull request #20370 from manishspuri/masterKasper Timm Hansen2015-05-292-5/+5
|\ | | | | formatting changes
| * formatting changesunknown2015-05-292-5/+5
|/
* Make the wording less confusingRafael Mendonça França2015-05-291-1/+1
| | | | | | This partially reverts commit ac02df5c7827630a91acd9a6b916db9eda1f38b4. [ci skip]
* Merge pull request #20367 from manishspuri/masterRafael Mendonça França2015-05-292-2/+2
|\ | | | | minor text change [ci skip]
| * minor text changeManish Puri2015-05-291-1/+1
| |
| * Update inline_preview_interceptor.rbManish Puri2015-05-291-1/+1
|/
* Merge pull request #20365 from ↵Rafael Mendonça França2015-05-295-79/+89
|\ | | | | | | | | repinel/revert-19878-replace_alias_chains_with_prepend Revert "Replace use of alias chains with prepend at core_ext/date and…
| * Revert "Replace use of alias chains with prepend at core_ext/date and ↵Roque Pinel2015-05-295-79/+89
| | | | | | | | core_ext/time"
* | Merge pull request #20366 from Gaurav2728/gaurav-mailerMatthew Draper2015-05-301-1/+0
|\ \ | |/ |/| not require mail file
| * not require mail fileGaurav Sharma2015-05-291-1/+0
|/ | | | | | ``` it added in this commit (https://github.com/rails/rails/commit/2a25c4ce6da6ea23ebdf44e7eb2d2441dbea20a1), now no warnings occur. ```
* Merge pull request #20364 from ernie/update-serialize-docsSean Griffin2015-05-291-0/+9
|\ | | | | | | | | | | Update docs for ActiveRecord `serialize` [ci skip]
| * Update docs for ActiveRecord `serialize`Ernie Miller2015-05-291-0/+9
|/ | | | | | | | | | | | For certain column types, using `serialize` is unnecessary, or the user may get unexpected contents back from the DB adapter (which is handling some basic deserialization for them). Call this out in the documentation. For background, see: https://gist.github.com/ernie/33f75f2294885b9806f9 https://twitter.com/erniemiller/status/604262907442905090
* Merge pull request #20355 from segiddins/seg-bundler-1-10Santiago Pastorino2015-05-292-2/+4
|\ | | | | Bundler 1.10 should work now!
| * Generate Bundler 1.10.1 lockfileSamuel E. Giddins2015-05-281-0/+3
| |
| * Revert "Use bundler < 1.10 until its bugs are fixed"Samuel E. Giddins2015-05-281-1/+1
| | | | | | | | This reverts commit 81b42970f02d07ca5007bbce920b489d80172636.
| * Revert "Uninstall bundler 1.10"Samuel E. Giddins2015-05-281-1/+0
| | | | | | | | This reverts commit 410d246bc0ddabe47f0bf54116be9087bd3d4bda.
| * Revert "Force the uninstall"Samuel E. Giddins2015-05-281-1/+1
| | | | | | | | This reverts commit 9ff901bd3e046b0373b28459269146707b5bf8c9.
* | Merge pull request #20358 from tgxworld/remove_codeSantiago Pastorino2015-05-291-2/+0
|\ \ | | | | | | Remove unused code.
| * | Remove unused code.Guo Xiang Tan2015-05-291-2/+0
| |/ | | | | | | Code was moved into the `assign` method.
* | Merge pull request #20354 from arunagw/fix-warning-ambiguous-first-argumentYves Senn2015-05-291-1/+1
|\ \ | |/ |/| Fix warning about ambiguous first argument
| * Fix warning about ambiguous first argumentArun Agrawal2015-05-291-1/+1
|/
* Merge pull request #19878 from pabloh/replace_alias_chains_with_prependRafael Mendonça França2015-05-285-89/+79
|\ | | | | Replace use of alias chains with prepend at core_ext/date and core_ext/time
| * Replace use of alias chains with prepend at core_ext/datePablo Herrero2015-05-045-89/+79
| |
* | Force the uninstallRafael Mendonça França2015-05-281-1/+1
| |
* | Uninstall bundler 1.10Rafael Mendonça França2015-05-281-0/+1
| |
* | Use bundler < 1.10 until its bugs are fixedRafael Mendonça França2015-05-281-1/+1
| | | | | | | | See https://github.com/bundler/bundler/issues/3681
* | Merge pull request #20351 from kddeisz/enumerable_pluckRafael Mendonça França2015-05-281-0/+10
|\ \ | | | | | | Updating the guides for Enumerable#pluck
| * | Updating the guides for Enumerable#pluckKevin Deisz2015-05-281-0/+10
|/ /
* | Merge pull request #20341 from ↵Rafael Mendonça França2015-05-281-36/+0
|\ \ | | | | | | | | | | | | vngrs/remove_already_defined_methods_in_rack_request Remove already defined methods in super class of ActionDispatch::Request class
| * | Remove already defined methods in super class of ActionDispatch::Request classMehmet Emin İNAÇ2015-05-281-36/+0
| | | | | | | | | | | | | | | | | | | | | These methods had defined in 2004 by dhh in initial commit and `ActionDispatch::Request` class has been inherited from `Rack::Request` class in 2009 by josh. In 2014 these methods and more of them defined in `Rack::Request` class so we don't need them anymore in rails codebase.
* | | Merge pull request #20346 from repinel/remove-mocha2Rafael Mendonça França2015-05-284-59/+117
|\ \ \ | | | | | | | | Remove use of mocha from Active Model
| * | | Remove use of mocha from Active ModelRoque Pinel2015-05-284-59/+117
| | | |
* | | | Merge pull request #20267 from kaspth/fix-minitest-constant-clashingRafael Mendonça França2015-05-288-43/+45
|\ \ \ \ | | | | | | | | | | Avoid E constant clashing with Minitest defined version.
| * | | | Avoid E constant clashing with Minitest defined version.Kasper Timm Hansen2015-05-228-43/+45
| | | | | | | | | | | | | | | | | | | | | | | | | Minitest sets an E constant to an empty string to save GC time. This clashes with autoloading tests which define an E constant.
* | | | | Merge pull request #20350 from kddeisz/enumerable_pluckRafael Mendonça França2015-05-283-0/+20
|\ \ \ \ \ | | | | | | | | | | | | Add Enumerable#pluck.
| * | | | | Add Enumerable#pluck.Kevin Deisz2015-05-283-0/+20
| | |/ / / | |/| | | | | | | | | | | | | Allows fetching the same values from arrays as from ActiveRecord associations.
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-01 00:53:05 +0000