aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ignore binds payload with nil column in AR log subscriberCarlos Antonio da Silva2013-01-082-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_keyAndrew White2013-01-081-1/+1
|\ | | | | refactor reset_primary_key and change !blank? to present? in get_primary...
| * change unless !blank? to if blank? in get_primary_keyAngelo capilleri2013-01-081-1/+1
| |
* | Merge pull request #8808 from tricknotes/use-absolute-pathCarlos Antonio da Silva2013-01-081-3/+3
|\ \ | | | | | | Use absolute path [ci skip]
| * | Use absolute pathRyunosuke SATO2013-01-081-3/+3
|/ / | | | | | | It is semantically correct than relative path.
* | Don't configure Turn output, we aren't using it since 3.2.0Guillermo Iguaran2013-01-071-7/+0
| |
* | Merge pull request #8801 from ktheory/dont_require_turnGuillermo Iguaran2013-01-071-5/+2
|\ \ | | | | | | Don't require 'turn' from rails/test_help
| * | Don't require 'turn' from rails/test_helpAaron Suggs2013-01-071-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 providedSantiago Pastorino2013-01-081-0/+2
| | | | | | | | | | | | This avoids "SECURITY WARNING: No secret option provided to Rack::Session::Cookie."
* | | Merge pull request #8802 from claudiob/patch-1Guillermo Iguaran2013-01-071-1/+1
|\ \ \ | | | | | | | | Update guides/source/getting_started.md [ci skip]
| * | | Update guides/source/getting_started.mdClaudio B.2013-01-071-1/+1
| |/ / | | | | | | Reflect change in 009873a that renamed the script/ folder to bin/
* | | Initialize instance variable to remove warningCarlos Antonio da Silva2013-01-071-0/+4
| | | | | | | | | | | | actions.rb:34: warning: instance variable @in_group not initialized
* | | Fix readme testsCarlos Antonio da Silva2013-01-071-2/+2
| | | | | | | | | | | | Related to the change introduced in 6cf47c533d7d6784d34fc31406a335555e0c32b8.
* | | Reset test data, and fix bug that the inserted data were not actually selectedAkira Matsuda2013-01-081-11/+16
| | |
* | | Reset AR::Migration.verbose change to avoid depending on test run orderAkira Matsuda2013-01-081-0/+1
| | |
* | | new README generated for new appsXavier Noria2013-01-083-499/+37
| | |
* | | doc/README_FOR_APP is no longer generatedXavier Noria2013-01-087-16/+11
| | |
* | | let the rails gem ship with the READMEXavier Noria2013-01-081-1/+1
| | | | | | | | | | | | The doc:rails application rake task needs this README.
* | | Fix named scope + class method exampleCarlos Antonio da Silva2013-01-071-3/+1
| | | | | | | | | | | | Closes #8804 [ci skip]
* | | Merge pull request #8803 from frodsan/sp_docsCarlos Antonio da Silva2013-01-071-8/+7
|\ \ \ | | | | | | | | Improve StrongParameters documentation [ci skip]
| * | | improve StrongParameters documentation [ci skip]Francesco Rodriguez2013-01-071-8/+7
| |/ /
* | | Merge pull request #8773 from goshakkk/guides-page-titlesXavier Noria2013-01-071-1/+3
|\ \ \ | | | | | | | | Place article name in the beginning of guides page title
| * | | place article name in the beginning of guides page titleGosha Arinich2013-01-061-1/+3
| | | |
* | | | Revert some warning removals related to Ruby 2.0Carlos Antonio da Silva2013-01-073-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-readersSteve Klabnik2013-01-072-3/+3
|\ \ \ | | | | | | | | Access ivars via instance reader methods for consistency
| * | | access `@path` and `@routes` via reader methods in journeyGosha Arinich2013-01-072-3/+3
|/ / /
* | | Merge pull request #8798 from goshakkk/show-exceptions-begin-rescueJosé Valim2013-01-071-7/+4
|\ \ \ | |_|/ |/| | Refactor ShowExceptions' #call to use def-rescue instead of begin-rescue
| * | refactor ShowExceptions' #call to use def-rescue instead of begin-rescueGosha Arinich2013-01-071-7/+4
| | |
* | | Use similar comment styleDavid Heinemeier Hansson2013-01-072-2/+2
|/ /
* | Merge pull request #8788 from goshakkk/remove-begin-rescueXavier Noria2013-01-071-10/+9
|\ \ | | | | | | Remove begin-rescue in favor of def-rescue
| * | remove begin-rescue in favor of def-rescueGosha Arinich2013-01-071-10/+9
| | |
* | | Take the heat :fire:Jeremy Kemper2013-01-061-0/+2
| | |
* | | Merge pull request #8786 from jeremy/executablesJeremy Kemper2013-01-0631-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 Kemper2013-01-0631-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ça2013-01-061-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 issueRafael Mendonça França2013-01-061-1/+1
| |
* | Remove the configuration key in the correct placeRafael Mendonça França2013-01-061-3/+1
| |
* | Merge pull request #8787 from tank-bohr/masterRafael Mendonça França2013-01-061-2/+2
|\ \ | | | | | | masgn and response variable
| * | return multiple assingment and response variabletank-bohr2013-01-071-2/+2
| | |
* | | Merge pull request #8785 from goshakkk/refactor-debug-exceptionsRafael Mendonça França2013-01-061-2/+1
|\ \ \ | |/ / |/| | Refactor DebugExceptions
| * | refactor DebugExceptions by combining two conditionals into oneGosha Arinich2013-01-071-2/+1
| | |
* | | Fix failing test under sqlite3Akira Matsuda2013-01-071-1/+1
| | |
* | | Reduce number of Strings a bitAkira Matsuda2013-01-074-7/+7
| | |
* | | Namespace HashWithIndifferentAccessAkira Matsuda2013-01-0711-19/+17
| | |
* | | Needs to reset SchemaMigration first, or the tests fail in sqlite3Akira Matsuda2013-01-071-1/+1
|/ /
* | Merge pull request #8783 from goshakkk/refactor-journey-routesRafael Mendonça França2013-01-061-12/+11
|\ \ | | | | | | Refactor Journey::Routes
| * | refactor Journey::RoutesGosha Arinich2013-01-071-12/+11
| | | | | | | | | | | | | | | * prefer do-end for multiline blocks * prefer or-equals over returns with checks
* | | Merge pull request #8782 from tank-bohr/masterRafael Mendonça França2013-01-061-2/+2
|\ \ \ | | | | | | | | doesn't work with rubinius
| * | | fix for rbxtank-bohr2013-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rubinius returns a boolean after such assingment response = (_, headers, body = @app.call(env)) see https://github.com/rubinius/rubinius/issues/2117 get rid of a local variable
* | | | Merge pull request #8781 from trisweb/tristan_8757_integer_column_nan_error_fixRafael Mendonça França2013-01-063-9/+12
|\ \ \ \ | |/ / / |/| / / | |/ / Fix error raised when assigning NaN to an integer column