aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Deprecate Hash#diff.Steve Klabnik2012-11-093-3/+5
| | | | | | It's no longer used in Rails any more. See https://github.com/rails/rails/pull/8142\#issuecomment-10227297 for more
* Merge pull request #8151 from nashby/forwardableCarlos Antonio da Silva2012-11-091-20/+2
|\ | | | | delegate PathSet's enumerator methods
| * delegate PathSet's enumerator methodsVasiliy Ermolovich2012-11-091-20/+2
| |
* | Merge pull request #8153 from steveklabnik/fix_include_blankCarlos Antonio da Silva2012-11-091-1/+1
|\ \ | | | | | | Fix message about include_blank option. [ci skip]
| * | Fix message about include_blank option.Steve Klabnik + Katrina Owen2012-11-091-1/+1
| | | | | | | | | | | | | | | See https://github.com/rails/rails/commit/cb7d19b66badfbd1846c195913419c331701074e#commitcomment-2127148.
* | | Relations built off collection associations with an unsaved owner should be ↵Jon Leighton2012-11-092-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null relations For example, the following should not run any query on the database: Post.new.comments.where(body: 'omg').to_a # => [] Fixes #5215.
* | | Merge pull request #8152 from steveklabnik/squashing_guideXavier Noria2012-11-091-0/+38
|\ \ \ | |/ / |/| | Add note about squashing in contributor guide.
| * | Add note about squashing in contributor guide.Steve Klabnik + Katrina Owen2012-11-091-0/+38
|/ / | | | | | | | | We tell people how to do this all the time in the Issues tracker, so now we can just point them here.
* | implement to_a and to_ary so that the Array() call in template.rb willAaron Patterson2012-11-091-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not raise so many exceptions: https://github.com/rails/rails/blob/master/actionpack/lib/action_view/template.rb#L126 irb(main):001:0> class Foo; def method_missing(*args); super; end end => nil irb(main):002:0> $DEBUG = true => true irb(main):003:0> Array(Foo.new) Exception `NoMethodError' at (irb):1 - undefined method `to_ary' for #<Foo:0x007f854390e488> Exception `NoMethodError' at (irb):1 - undefined method `to_a' for #<Foo:0x007f854390e488> => [#<Foo:0x007f854390e488>] irb(main):004:0>
* | make the extremely useful logs debug levelAaron Patterson2012-11-091-2/+2
| |
* | copy the log level from the config settingsAaron Patterson2012-11-091-0/+1
| |
* | Merge pull request #7763 from route/full-captureCarlos Antonio da Silva2012-11-083-11/+29
|\ \ | | | | | | Kernel#capture replaced by version which can catch output from subprocesses
| * | Kernel#capture replaced by version which can catch output from subprocessesDmitry Vorotilin2012-11-013-11/+29
| | |
* | | rm dead codeAaron Patterson2012-11-091-1/+1
| | |
* | | Merge pull request #8147 from gbchaosmaster/gemspecRafael Mendonça França2012-11-087-69/+83
|\ \ \ | | | | | | | | Reformat gemspec
| * | | Clean up gemspecsVinny Diehl2012-11-087-69/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Organized the gemspec files a bit. * Made quotes more consistent (single quotes dominated, so I used that). * Moved license line down a line, separating it logically, and removed the extra whitespace before its = operator. * Minor whitespace fixes.
* | | | Revert "Merge pull request #8017 from jcoglan/objectless_sessions"Jon Leighton2012-11-093-47/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 36376560fdd02f955ae3bf6b7792b784443660ad, reversing changes made to 3148ed9a4bb7efef30b846dc945d73ceebcc3f0f. Conflicts: actionpack/lib/action_dispatch/middleware/flash.rb Reason: it broke Sam's CI https://github.com/rails/rails/pull/8017#issuecomment-10210655
* | | | Remove free usage of #tapCarlos Antonio da Silva2012-11-081-3/+4
| | | |
* | | | Merge pull request #8017 from jcoglan/objectless_sessionsJon Leighton2012-11-083-10/+46
|\ \ \ \ | | | | | | | | | | Store FlashHashes in the session as plain hashes
| * | | | Store FlashHashes in the session as plain hashes rather than custom objects ↵James Coglan2012-11-033-10/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with unstable class names and instance variables. Refactor FlashHash to take values for its ivars in the constructor, to pretty up FlashHash.from_session_value. Remove stale comment on FlashHash: it is no longer Marshaled in the session so we can change its implementation. Remove blank lines I introduced in controller/test_case.rb. Unit tests for FlashHash#to_session_value. Put in a compatibility layer to accept FlashHash serializations from Rails 3.0+. Test that Rails 3.2 session flashes are correctly converted to the new format. Remove code path for processing Rails 3.0 FlashHashes since they can no longer deserialize.
* | | | | Merge pull request #8115 from senny/7842_handle_trailing_slash_with_enginesRafael Mendonça França2012-11-082-3/+6
|\ \ \ \ \ | |_|/ / / |/| | | | handle trailing slash with engines (test case for #7842)
| * | | | routing prefix slash replacement is no longer necessaryYves Senn2012-11-041-3/+1
| | | | |
| * | | | test case to lock down the behavior of #7842Yves Senn2012-11-041-0/+5
| | | | |
* | | | | Merge pull request #8145 from sobrinho/masterRafael Mendonça França2012-11-081-0/+11
|\ \ \ \ \ | | | | | | | | | | | | Add test to avoid regression of 58e48d5
| * | | | | Add test to avoid regression of 58e48d5292242f000dc8a87fdbb1c0ccdcf286d8Gabriel Sobrinho & Ricardo Henrique2012-11-081-0/+11
| | | | | |
* | | | | | Add CHANGELOG entry for #8108 on master too.Rafael Mendonça França2012-11-081-0/+16
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #8139 from ↵Carlos Antonio da Silva2012-11-084-3/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | senny/8121_engine_generator_rakefile_without_test_unit Add app Rake tasks when -T and --dummy-path is passed to `plugin new`
| * | | | | `plugin new` adds dummy app tasks when necessary.Yves Senn2012-11-084-3/+18
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #8121 The `plugin new` generator always adds the dummy app rake tasks, when a dummy app was created.
* | | | | Remove not used indifferent_access requires from Base and FinderMethodsCarlos Antonio da Silva2012-11-072-3/+0
| | | | |
* | | | | Use cached quoted_table_name instead of going through the connectionCarlos Antonio da Silva2012-11-071-1/+1
| | | | |
* | | | | Remove block given check from private find_with_idsCarlos Antonio da Silva2012-11-071-2/+0
| |_|_|/ |/| | | | | | | | | | | | | | | This is already handled by #find, it's a duplicate check, since find_with_ids is not called from anywhere else.
* | | | Fix guides home links and maintain compatibility with small screensCarlos Antonio da Silva2012-11-071-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 65a2977cdd55678d3eab06434625375914511786 has introduced some changes to format content for small devices, this change reverts the original font size for normal screens while maintaing the same format for these devices. [ci skip]
* | | | Do not strip code blocks, otherwise we may get misaligned outputCarlos Antonio da Silva2012-11-071-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | stop raising so many exceptionsAaron Patterson2012-11-071-1/+5
| | | |
* | | | adding requires for constant dependenciesAaron Patterson2012-11-072-0/+6
| | | |
* | | | cleaning up constantize testsAaron Patterson2012-11-071-44/+44
| | | |
* | | | fix warnings in Ruby 2.0Aaron Patterson2012-11-072-0/+4
| | | |
* | | | Merge pull request #8132 from bquorning/permitted_is_sticky_on_sliceCarlos Antonio da Silva2012-11-062-7/+34
|\ \ \ \ | | | | | | | | | | Permitted should be sticky on #slice
| * | | | Set @permitted on new instance when slicing parameters hashBenjamin Quorning2012-11-061-1/+3
| | | | |
| * | | | Test that permitted? is sticky on accessors, mutators, and mergesBenjamin Quorning2012-11-061-0/+24
| | | | |
| * | | | Test that not permitted is sticky on #exceptBenjamin Quorning2012-11-061-0/+1
| | | | |
| * | | | Current tests are testing stickiness of non-permitted parametersBenjamin Quorning2012-11-061-3/+3
| | | | |
| * | | | Fix buggy testsBenjamin Quorning2012-11-061-4/+4
|/ / / /
* | | | Update mocha github repo to new oneCarlos Antonio da Silva2012-11-061-1/+1
| | | |
* | | | mocha_standalone is now deprecated. Switch to mocha/api.Jeremy Kemper2012-11-052-2/+2
| | | |
* | | | Make the tests pass with minitest 4.2Rafael Mendonça França2012-11-051-0/+3
| | | |
* | | | Merge pull request #8118 from nashby/activemodel-errorsRafael Mendonça França2012-11-053-23/+41
|\ \ \ \ | | | | | | | | | | use Array() instead of flatten
| * | | | use Array() instead flattenVasiliy Ermolovich2012-11-053-23/+41
| | | | | | | | | | | | | | | | | | | | | | | | | * move ActiveModel::Errors tests to errors_test.rb * add spec coverage for add_on_empty and add_on_blank
* | | | | Remove AS::Concern extension from Testing::TaggedLoggingCarlos Antonio da Silva2012-11-051-4/+0
|/ / / /
* | | | Minor css style improvementsCarlos Antonio da Silva2012-11-041-47/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some indenting for some properties and closing }, remove tabs, and merge two pre/code definitions. [ci skip]