Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "unpermitted params" exception -- it's just not going to work. See ↵ | David Heinemeier Hansson | 2013-01-08 | 4 | -150/+11 |
| | | | | the discussion on https://github.com/rails/strong_parameters/pull/75. | ||||
* | Never treat action or controller as unpermitted params | David Heinemeier Hansson | 2013-01-08 | 2 | -6/+25 |
| | |||||
* | Bump rack dependency to 1.4.3 | Carlos Antonio da Silva | 2013-01-08 | 1 | -1/+1 |
| | | | | | | | It includes security bug fixes and changes the initialization of Rack::File to accept a hash, otherwise generating warnings. See 295806e for the warnings fix. | ||||
* | Merge pull request #8812 from rubys/master | Carlos Antonio da Silva | 2013-01-08 | 1 | -1/+1 |
|\ | | | | | Eliminate Rack::File headers deprecation warning | ||||
| * | Eliminate Rack::File headers deprecation warning | Sam Ruby | 2013-01-08 | 1 | -1/+1 |
|/ | | | | | | | | | | | | See http://intertwingly.net/projects/AWDwR4/checkdepot/section-6.1.html rake test produces: "Rack::File headers parameter replaces cache_control after Rack 1.5." Despite what the message says, it appears that the hearders parameter change will be effective as of Rack 1.5: https://github.com/rack/rack/blob/rack-1.4/lib/rack/file.rb#L24 https://github.com/rack/rack/blob/master/lib/rack/file.rb#L24 | ||||
* | Do not generate local vars for partials without object or collection | Carlos Antonio da Silva | 2013-01-08 | 4 | -1/+15 |
| | | | | | | | | | Previously rendering a partial without giving :object or :collection would generate a local variable with the partial name by default. This was noticed due to warnings in Ruby 2.0 of not used variables, which turned out to be the generation of not used variables inside partials that do not contain objects related to them. | ||||
* | Ignore binds payload with nil column in AR log subscriber | Carlos Antonio da Silva | 2013-01-08 | 2 | -21/+33 |
| | | | | | | | | | | | | | Some tests were raising the following error: Could not log "sql.active_record" event. NoMethodError: undefined method `type' for nil:NilClass` Due to the way binds were being logged, the column info was considered always present, but that is not true for some of the tests listed in the issue. Closes #8806. | ||||
* | Merge pull request #8800 from acapilleri/primary_key | Andrew White | 2013-01-08 | 1 | -1/+1 |
|\ | | | | | refactor reset_primary_key and change !blank? to present? in get_primary... | ||||
| * | change unless !blank? to if blank? in get_primary_key | Angelo capilleri | 2013-01-08 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #8808 from tricknotes/use-absolute-path | Carlos Antonio da Silva | 2013-01-08 | 1 | -3/+3 |
|\ \ | | | | | | | Use absolute path [ci skip] | ||||
| * | | Use absolute path | Ryunosuke SATO | 2013-01-08 | 1 | -3/+3 |
|/ / | | | | | | | It is semantically correct than relative path. | ||||
* | | Don't configure Turn output, we aren't using it since 3.2.0 | Guillermo Iguaran | 2013-01-07 | 1 | -7/+0 |
| | | |||||
* | | Merge pull request #8801 from ktheory/dont_require_turn | Guillermo Iguaran | 2013-01-07 | 1 | -5/+2 |
|\ \ | | | | | | | Don't require 'turn' from rails/test_help | ||||
| * | | Don't require 'turn' from rails/test_help | Aaron Suggs | 2013-01-07 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If 'turn' is in the Gemfile with `:require => nil`, Rails should respect that. This supports the case where 'turn' may or may not be required depending on different developers' preference or environment. E.g., you require turn for local testing, but not on your CI server by putting this in `test/test_helper.rb`: require 'turn' if ENV['TURN'] | ||||
* | | | Avoid Rack security warning no secret provided | Santiago Pastorino | 2013-01-08 | 1 | -0/+2 |
| | | | | | | | | | | | | This avoids "SECURITY WARNING: No secret option provided to Rack::Session::Cookie." | ||||
* | | | Merge pull request #8802 from claudiob/patch-1 | Guillermo Iguaran | 2013-01-07 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Update guides/source/getting_started.md [ci skip] | ||||
| * | | | Update guides/source/getting_started.md | Claudio B. | 2013-01-07 | 1 | -1/+1 |
| |/ / | | | | | | | Reflect change in 009873a that renamed the script/ folder to bin/ | ||||
* | | | Initialize instance variable to remove warning | Carlos Antonio da Silva | 2013-01-07 | 1 | -0/+4 |
| | | | | | | | | | | | | actions.rb:34: warning: instance variable @in_group not initialized | ||||
* | | | Fix readme tests | Carlos Antonio da Silva | 2013-01-07 | 1 | -2/+2 |
| | | | | | | | | | | | | Related to the change introduced in 6cf47c533d7d6784d34fc31406a335555e0c32b8. | ||||
* | | | Reset test data, and fix bug that the inserted data were not actually selected | Akira Matsuda | 2013-01-08 | 1 | -11/+16 |
| | | | |||||
* | | | Reset AR::Migration.verbose change to avoid depending on test run order | Akira Matsuda | 2013-01-08 | 1 | -0/+1 |
| | | | |||||
* | | | new README generated for new apps | Xavier Noria | 2013-01-08 | 3 | -499/+37 |
| | | | |||||
* | | | doc/README_FOR_APP is no longer generated | Xavier Noria | 2013-01-08 | 7 | -16/+11 |
| | | | |||||
* | | | let the rails gem ship with the README | Xavier Noria | 2013-01-08 | 1 | -1/+1 |
| | | | | | | | | | | | | The doc:rails application rake task needs this README. | ||||
* | | | Fix named scope + class method example | Carlos Antonio da Silva | 2013-01-07 | 1 | -3/+1 |
| | | | | | | | | | | | | Closes #8804 [ci skip] | ||||
* | | | Merge pull request #8803 from frodsan/sp_docs | Carlos Antonio da Silva | 2013-01-07 | 1 | -8/+7 |
|\ \ \ | | | | | | | | | Improve StrongParameters documentation [ci skip] | ||||
| * | | | improve StrongParameters documentation [ci skip] | Francesco Rodriguez | 2013-01-07 | 1 | -8/+7 |
| |/ / | |||||
* | | | Merge pull request #8773 from goshakkk/guides-page-titles | Xavier Noria | 2013-01-07 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Place article name in the beginning of guides page title | ||||
| * | | | place article name in the beginning of guides page title | Gosha Arinich | 2013-01-06 | 1 | -1/+3 |
| | | | | |||||
* | | | | Revert some warning removals related to Ruby 2.0 | Carlos Antonio da Silva | 2013-01-07 | 3 | -6/+0 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These warnings were actually a bug in Ruby 2.0, the accessors should not be raising such warnings, they are only meant for ivars. - Revert "fix warnings in Ruby 2.0" This reverts commit 26702a6d3461f4a1c75165030b96886514ecb877. - Revert "Merge pull request #8282 from arunagw/warning_removed_for_ruby2" This reverts commit f63d6544e45e78cda29c0c56fbdf3d9e1f405340, reversing changes made to 3a890681fad8218305585036abed6d7463a44e41. | ||||
* | | | Merge pull request #8799 from goshakkk/ivar-readers | Steve Klabnik | 2013-01-07 | 2 | -3/+3 |
|\ \ \ | | | | | | | | | Access ivars via instance reader methods for consistency | ||||
| * | | | access `@path` and `@routes` via reader methods in journey | Gosha Arinich | 2013-01-07 | 2 | -3/+3 |
|/ / / | |||||
* | | | Merge pull request #8798 from goshakkk/show-exceptions-begin-rescue | José Valim | 2013-01-07 | 1 | -7/+4 |
|\ \ \ | |_|/ |/| | | Refactor ShowExceptions' #call to use def-rescue instead of begin-rescue | ||||
| * | | refactor ShowExceptions' #call to use def-rescue instead of begin-rescue | Gosha Arinich | 2013-01-07 | 1 | -7/+4 |
| | | | |||||
* | | | Use similar comment style | David Heinemeier Hansson | 2013-01-07 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #8788 from goshakkk/remove-begin-rescue | Xavier Noria | 2013-01-07 | 1 | -10/+9 |
|\ \ | | | | | | | Remove begin-rescue in favor of def-rescue | ||||
| * | | remove begin-rescue in favor of def-rescue | Gosha Arinich | 2013-01-07 | 1 | -10/+9 |
| | | | |||||
* | | | Take the heat :fire: | Jeremy Kemper | 2013-01-06 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #8786 from jeremy/executables | Jeremy Kemper | 2013-01-06 | 31 | -230/+163 |
|\ \ \ | | | | | | | | | Introduce ./bin for your app's executables: bin/bundle, bin/rails, bin/rake | ||||
| * | | | Introduce ./bin for your app's executables: bin/bundle, bin/rails, bin/rake. ↵ | Jeremy Kemper | 2013-01-06 | 31 | -230/+163 |
|/ / / | | | | | | | | | | Executable scripts are versioned code like the rest of your app. To generate a stub for a bundled gem: 'bundle binstubs unicorn' and 'git add bin/unicorn' | ||||
* / / | Use whitelist to pass valid connection parameters to PGConn. | Rafael Mendonça França | 2013-01-06 | 1 | -7/+10 |
|/ / | | | | | | | | | | | | | | | | | All the valids parameters for libpq are used. See http://www.postgresql.org/docs/9.1/static/libpq-connect.html for the full list Fixes #8784 | ||||
* | | Fix operators precedence issue | Rafael Mendonça França | 2013-01-06 | 1 | -1/+1 |
| | | |||||
* | | Remove the configuration key in the correct place | Rafael Mendonça França | 2013-01-06 | 1 | -3/+1 |
| | | |||||
* | | Merge pull request #8787 from tank-bohr/master | Rafael Mendonça França | 2013-01-06 | 1 | -2/+2 |
|\ \ | | | | | | | masgn and response variable | ||||
| * | | return multiple assingment and response variable | tank-bohr | 2013-01-07 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #8785 from goshakkk/refactor-debug-exceptions | Rafael Mendonça França | 2013-01-06 | 1 | -2/+1 |
|\ \ \ | |/ / |/| | | Refactor DebugExceptions | ||||
| * | | refactor DebugExceptions by combining two conditionals into one | Gosha Arinich | 2013-01-07 | 1 | -2/+1 |
| | | | |||||
* | | | Fix failing test under sqlite3 | Akira Matsuda | 2013-01-07 | 1 | -1/+1 |
| | | | |||||
* | | | Reduce number of Strings a bit | Akira Matsuda | 2013-01-07 | 4 | -7/+7 |
| | | | |||||
* | | | Namespace HashWithIndifferentAccess | Akira Matsuda | 2013-01-07 | 11 | -19/+17 |
| | | |