Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-07-28 | 5 | -55/+44 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Typo fix | Mikhail Dieterle | 2013-07-28 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Using markdown-style code quotes | Mikhail Dieterle | 2013-07-28 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Fix lixml2 to libxml2 [ci skip] | Robin Dupret | 2013-07-28 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Fixes typo in Object#try! | Jay Hayes | 2013-07-26 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Use hyphenated version of assert_url [ci skip] | Robin Dupret | 2013-07-26 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Add a SQL example for `not` [ci skip] | Robin Dupret | 2013-07-26 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | To share a certain logic across other examples, let's add a sample SQL code generated by the given Ruby code | |||||
| * | | | | | Refix my misreading of the diff | Damien Mathieu | 2013-07-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | sorry @robin850. Thanks @fxn | |||||
| * | | | | | Revert "Fix the SQLite gem name" | Damien Mathieu | 2013-07-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 700c6c65bcce17d4c61423ceaef031bcbe203337. Bot the `sqlite3` and `sqlite3-ruby` gems exist. https://rubygems.org/gems/sqlite3 https://rubygems.org/gems/sqlite3-ruby In fact, they both point to the same github repository. https://github.com/luislavena/sqlite3-ruby However, the last one hasn't been released since 2011, while the first one keeps getting regular releases. | |||||
| * | | | | | Add packages list for ArchLinux [ci skip] | Robin Dupret | 2013-07-24 | 1 | -0/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Add the packages required on Arch Linux when setting up the development dependencies | |||||
| * | | | | | Fix the SQLite gem name | Robin Dupret | 2013-07-24 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Removed doc of removed method diff [ci skip] | Rashmi Yadav | 2013-07-24 | 1 | -38/+0 | |
| | | | | | | ||||||
| * | | | | | Updated guides with latest method [ci skip] | Rashmi Yadav | 2013-07-24 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | fixed file name references [ci skip] | Rashmi Yadav | 2013-07-24 | 1 | -4/+4 | |
| | | | | | | ||||||
| * | | | | | Updated guides with latest method [ci skip] | Rashmi Yadav | 2013-07-23 | 1 | -4/+5 | |
| | | | | | | | | | | | | | | | | | | for blank? | |||||
* | | | | | | Merge pull request #11633 from neerajdotname/fix_rder_dependent_test | Guillermo Iguaran | 2013-07-28 | 1 | -0/+5 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix order dependent test | |||||
| * | | | | | | fix order dependent test | Neeraj Singh | 2013-07-28 | 1 | -0/+5 | |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | `ReflectionTest` uses column information in tests and those tests break if tests are run in random order. | |||||
* | | | | | | Merge pull request #11625 from phstc/minor-refactor-code-gardener-grouping | Rafael Mendonça França | 2013-07-27 | 2 | -2/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Minor refactor - Uses Enumerable#to_a instead of iterate and add to an array | |||||
| * | | | | | Minor refactor - Uses Enumerable#to_a instead of iterate and add to an | Pablo Cantero | 2013-07-27 | 3 | -5/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | array | |||||
* | | | | | | Merge pull request #11620 from spajus/update_docs | Santiago Pastorino | 2013-07-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Update Rails 3.2.x guide link [ci skip] | |||||
| * | | | | | Update Rails 3.2.x guide link [ci skip] | Tomas Varaneckas | 2013-07-27 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #11611 from arunagw/api-generation-av | Xavier Noria | 2013-07-26 | 1 | -7/+5 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Excluding action_view/vendor in API[ci skip] | |||||
| * | | | | Removed excluding vendor from API doc [ci skip] | Arun Agrawal | 2013-07-26 | 1 | -6/+3 | |
| | | | | | | | | | | | | | | | | | | | | These folder not exists in system | |||||
| * | | | | Excluding action_view/vendor in API [ci skip] | Arun Agrawal | 2013-07-26 | 1 | -1/+2 | |
|/ / / / | ||||||
* | | | | Refactor handling of action normalization | Max Shytikov | 2013-07-26 | 1 | -11/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Reference: Bloody mess internals http://gusiev.com/slides/rails_contribution/static/#40 | |||||
* | | | | Be sure to restore the default I18n.locale after changed its value in a test | Akira Matsuda | 2013-07-26 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Fix order dependent tests | Akira Matsuda | 2013-07-26 | 1 | -2/+10 | |
| | | | | | | | | | | | | | | | | Restore default ActiveSupport::XmlMini.backend after tests | |||||
* | | | | Don't mutate the Base settings by merge!ing the given value | Akira Matsuda | 2013-07-26 | 2 | -1/+4 | |
| | | | | ||||||
* | | | | Reset ActionView::Base.logger instead of AC::Base.logger | Akira Matsuda | 2013-07-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | see: 9b0ac0bc74569db460f87ea6888b3847be0ff5be | |||||
* | | | | Fix order dependent tests | Akira Matsuda | 2013-07-26 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | Reset ActionView::Base.logger after tests | |||||
* | | | | Fix order dependent AP test | Akira Matsuda | 2013-07-26 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | any_instance.stubs + unstub with Mocha doesn't restore the original status in the following case, so we need to undef Customer#to_json before every test require 'test/unit' require 'mocha/setup' module M def foo() :foo; end end class C include M undef_method :foo end C.any_instance.stubs(:foo).returns(:mocha) C.any_instance.unstub(:foo) | |||||
* | | | | grab executable from rubygems | Aaron Patterson | 2013-07-25 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #11598 from Karunakar/flat_map1 | Rafael Mendonça França | 2013-07-25 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Used flat_map instead of map.flatten in mas_many_through_associations_test.rb | |||||
| * | | | | used flat_map instead of map.flatten | Karunakar (Ruby) | 2013-07-25 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #11582 from steveklabnik/add_bin | Steve Klabnik | 2013-07-25 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | rake -> bin/rake | |||||
| * | | | | rake -> bin/rake | Steve Klabnik | 2013-07-24 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #11341 from arunagw/added-missing-actionview-to-install | Rafael Mendonça França | 2013-07-25 | 2 | -3/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Added description in actionview gemspec. | |||||
| * | | | | | Added some description to generate actionview gem [ci skip] | Arun Agrawal | 2013-07-17 | 2 | -3/+1 | |
| | | | | | | ||||||
* | | | | | | :scissors: [ci skip] | Carlos Antonio da Silva | 2013-07-25 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #11591 from ankit8898/typo | Carlos Antonio da Silva | 2013-07-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Typo fix [ci skip] | |||||
| * | | | | | | Typo fix | Ankit Gupta | 2013-07-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci] Fixing the typo which is formed a not required link. Check here http://api.rubyonrails.org/classes/ActionController/Base.html under paramters section keeping it under tt tag | |||||
* | | | | | | | Merge pull request #11593 from rajcybage/fix_test_models | Carlos Antonio da Silva | 2013-07-25 | 2 | -5/+3 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | change function def self.table_name to self.table_name | |||||
| * | | | | | | | change function def self.table_name to self.table_name | Rajarshi Das | 2013-07-25 | 2 | -5/+3 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change def self.primary_key to self.primary_key change def self.primary_key to self.primary_key | |||||
* / / / / / / | More unused associations in AR test models | Akira Matsuda | 2013-07-25 | 8 | -13/+0 | |
|/ / / / / / | ||||||
* | | | | | | Clean up unused associations in AR test model | Akira Matsuda | 2013-07-25 | 1 | -3/+0 | |
| | | | | | | ||||||
* | | | | | | Use Ruby 2.0 caller_locations instead of caller if available | Akira Matsuda | 2013-07-25 | 1 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * we no more have to manipulate the each caller strings by ourselves using caller_locations * caller_locations runs slightly faster, and creates less objects than good old caller Benchmark (loading an Engine 1000 times): caller: 262.89 ms caller_locations: 186.068 ms | |||||
* | | | | | | Privatize non-test method | Akira Matsuda | 2013-07-25 | 1 | -0/+1 | |
| | | | | | | ||||||
* | | | | | | Allow overriding of all headers from passed environment hash | Andrew White | 2013-07-25 | 3 | -5/+42 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow REMOTE_ADDR, HTTP_HOST and HTTP_USER_AGENT to be overridden from the environment passed into `ActionDispatch::TestRequest.new`. Fixes #11590 | |||||
* | | | | | | Merge pull request #11585 from vipulnsward/hstore_change | Rafael Mendonça França | 2013-07-24 | 1 | -6/+3 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Cleanup task for informing about hstore | |||||
| * | | | | | | Cleanup task for informing about hstore | Vipul A M | 2013-07-25 | 1 | -6/+3 | |
| | |/ / / / | |/| | | | |