aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #6454 from rafmagana/guides_rails_on_rackVijay Dev2012-05-261-21/+41
|\ \ | | | | | | [guides] Update rails on rack
| * | use ActionDispatch::MiddlewareStack instead of ActionController::MiddlewareStackRafael Magana2012-05-221-3/+3
| | |
| * | update loaded middlewares and use of Rack::Server instead of Rack::BuilderRafael Magana2012-05-221-13/+33
| | |
| * | use ApplicationName::Application instead of ActionController::Dispatcher.new ↵Rafael Magana2012-05-221-6/+6
| | | | | | | | | | | | since Dispatcher class no longer exists
* | | Merge pull request #6491 from ↵Vijay Dev2012-05-261-6/+36
|\ \ \ | | | | | | | | | | | | | | | | rafmagana/getting_started_update_setting_app_home_page [getting started] Update Setting the Application Home Page to show the generated get "welcome/index" route
| * | | [getting started] Update Setting the Application Home Page to show the get ↵Rafael Magana2012-05-251-6/+36
| | | | | | | | | | | | | | | | "welcome/index" route
* | | | Merge pull request #4132 from Juanmcuello/clone_structureAaron Patterson2012-05-251-0/+1
|\ \ \ \ | | | | | | | | | | Reset postgreSQL search path in db:test:clone_structure.
| * | | | Reset postgreSQL search path in db:test:clone_structure.Juan M. Cuello2011-12-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch resets the postgres search path in the structure.sql after the structure is dumped in order to find schema_migrations table when multiples schemas are used. Fixes #945
* | | | | Merge pull request #6493 from markmcspadden/hash_keys_order_methodsRafael Mendonça França2012-05-251-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Reorder deep_symbolize_keys methods
| * | | | | Reorder deep_symbolize_keys methodsMark McSpadden2012-05-251-7/+7
|/ / / / /
* | | | | Merge pull request #5872 from evtuhovich/prepared_statement_fixAaron Patterson2012-05-251-10/+10
|\ \ \ \ \ | | | | | | | | | | | | Remove prepared statement from system query in postgresql adapter
| * | | | | Remove prepared statement from system query in postgresql adapterIvan Evtukhovich2012-05-121-10/+10
| | | | | |
* | | | | | Merge pull request #5244 from fotos/myqsl2_wait_timeoutRafael Mendonça França2012-05-251-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | Maximum wait_timeout on Windows is 2147483
| * | | | | Maximum wait_timeout on Windows is 2147483Fotos Georgiadis2012-03-021-1/+1
| | | | | |
* | | | | | Merge pull request #6487 from avakhov/range-sum-optimizationRafael Mendonça França2012-05-252-2/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix Range#sum optimized version
| * | | | | | Fix Range#sum optimized versionAlexey Vakhov2012-05-252-2/+11
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At 1bd4d1c67459a91415ee73a8f55d2309c0d62a87 was added Range#sum optimized version for arithmetic progressions. This improvment injected a defect with not integer range boundaries. The defect was fixed by e0adfa82c05f9c975005f102b4bcaebfcd17d241. The second commit really disabled optimization at all because in Ruby integer-valued numbers are instances of Fixnum and Bignum classes. We should #use is_a? (#kind_of?) method instead #instance_of? to check if value is numerical: 1.class # => Fixnum 1.instance_of?(Integer) # => false 1.is_a?(Integer) # => true -100_000_000_000.class # => Bignum -100_000_000_000.instance_of?(Integer) # => false -100_000_000_000.is_a?(Integer) # => true Moreover original implementation of Range#sum has a defect with reverse range boundaries. If the first boundary is less than the second range is empty. Current commit fixes and tests this case too.
* | | | | | Merge pull request #4785 from ↵José Valim2012-05-252-4/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ayamomiji/add-self-to-allow-method-name-using-ruby-keyword add `self.` to allow method name using ruby keyword
| * | | | | | fix `alias_attribute` will raise a syntax error if make an alias on aayaya2012-05-142-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | column that named as a ruby keyword
* | | | | | | Remove implicit dependency on pathnameJosé Valim2012-05-252-4/+4
| | | | | | |
* | | | | | | Merge pull request #6482 from waseem/fix_build_4008José Valim2012-05-241-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixes build 4008.1
| * | | | | | | Fixes build 4008.1Waseem Ahmad2012-05-251-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixex build 4008.1[1] because of the changes made in 4001835db00ce44cb75bca33ec02cd76b8ccc790 [1] http://travis-ci.org/#!/rails/rails/jobs/1429671
* | | | | | | Merge pull request #6481 from schneems/schneems/sextant-routesRafael Mendonça França2012-05-241-9/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove Unnecessary Test from route_inspect_test
| * | | | | | | remove unnecessary test from route_inspect_testschneems2012-05-241-9/+0
| | | | | | | |
* | | | | | | | do not set the ENGINE_PATH to nilAaron Patterson2012-05-241-1/+1
| | | | | | | |
* | | | | | | | `name` should be public.Aaron Patterson2012-05-241-12/+12
| | | | | | | |
* | | | | | | | Add missing requires for deep_dup and hash ext testCarlos Antonio da Silva2012-05-242-0/+3
| | | | | | | |
* | | | | | | | Merge pull request #5925 from Juanmcuello/pg_structure_dumpCarlos Antonio da Silva2012-05-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quote arguments in db:structure:dump for PostgreSQL.
* | | | | | | | Use deep_dup in the deep_transform_keys tests.Rafael Mendonça França2012-05-241-20/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using only dup make some tests to not catch up an implementation error because the methods were changing the nested hashes. Related to: https://github.com/rails/rails/commit/541429fbe49b0671adb3842ab1818230d670ef9f#L1R96
* | | | | | | | Merge pull request #6461 from schneems/schneems/sextant-routesAndrew White2012-05-2410-14/+104
|\| | | | | | | | | | | | | | | | | | | | | | | View your Routes without waiting on Rake
| * | | | | | | Rails::InfoController tests passingschneems2012-05-243-6/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes new tests for /rails/info/routes
| * | | | | | | /rails/info/routes path shows routing informationschneems2012-05-247-8/+72
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Will show similar contents to the output of `$ rake routes` in the browser in development. This speeds the time required to generate routes, since the application is already initialized.
* | | | | | | Merge pull request #6471 from parndt/rails_root_should_be_join_ableJosé Valim2012-05-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixes possible backward incompatibility
| * | | | | | | Fixed backward incompatibility for engines.Philip Arndt2012-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Many engines rely on being able to join directories to the Rails root: Rails.root.join('somedir') - This was now impossible because Rails.root returned a String: NoMethodError: undefined method `join' for "/code/myrailsapp":String - This was broken in 4001835db00ce44cb75bca33ec02cd76b8ccc790
* | | | | | | | Merge pull request #6447 from ↵Piotr Sarnacki2012-05-231-0/+29
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | chancancode/add_backporting_instructions_to_contrib_guides Added instructions for backporting changes to guides.
| * | | | | | | Added instructions for backporting changes to guides.Godfrey Chan2012-05-231-0/+29
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was looking for instructions on backporting changes the other day and wasn't able to find it anywhere. I updated the contrib guides based on the disccusion in #6420, #6215 and #6447.
* | | | | | | use File.join rather than depend on PathnameAaron Patterson2012-05-231-1/+1
| | | | | | |
* | | | | | | Revert "require the constants we use. ensure that root always returns a ↵Aaron Patterson2012-05-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pathname" This reverts commit d77b576c0330d8b1c6189cb94814382ce32baab6.
* | | | | | | require the constants we use. ensure that root always returns a PathnameAaron Patterson2012-05-231-1/+2
| | | | | | |
* | | | | | | removing more pathnameismsAaron Patterson2012-05-232-6/+4
| | | | | | |
* | | | | | | use File.join to decrease dependencies on PathnameAaron Patterson2012-05-231-1/+1
| | | | | | |
* | | | | | | Merge pull request #6466 from markmcspadden/hash_deep_transform_keysRafael Mendonça França2012-05-234-19/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add Hash#deep_transform_keys and Hash#deep_transform_keys! Also convert ...
| * | | | | | | Add Hash#deep_transform_keys and Hash#deep_transform_keys! Also convert ↵Mark McSpadden2012-05-234-19/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deep_*_keys to use deep_transform_keys.
* | | | | | | | Whitespaces :scissors:Rafael Mendonça França2012-05-232-7/+7
| | | | | | | |
* | | | | | | | PGconn doesn't accepts :checkout_timeout option.Rafael Mendonça França2012-05-231-1/+1
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option was added on cb6f839359bd894feb0a1105b79af72b336aa41e renaming the :wait_timeout option. Fix build http://travis-ci.org/#!/rails/rails/jobs/1413405
* | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-2310-78/+554
|\ \ \ \ \ \ \
| * | | | | | | copy edits in collection proxy docs [ci skip]Vijay Dev2012-05-231-25/+18
| | | | | | | |
| * | | | | | | Revert "Remove Obsolute root specifiying short syntax"Vijay Dev2012-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit feaa7b35a0214240eb34780ab51b843571e74904. Reason: Incorrect change. That's a Rails 4 feature and will not obviously work in 3.2.3. [ci skip]
| * | | | | | | Revert "Remove blank trailing comments"Vijay Dev2012-05-23105-0/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a. Reason: Not a fan of such massive changes. We usually close such changes if made to Rails master as a pull request. Following the same principle here and reverting. [ci skip]
| * | | | | | | copy edit[ci skip]Vijay Dev2012-05-231-1/+1
| | | | | | | |
| * | | | | | | [Guides] Fix sample codeOscar Del Ben2012-05-231-1/+1
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 17:43:30 +0000