aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrophes a ↵Jeremy Kemper2012-10-061-1/+1
| | | | few times, so fix up the test to work with however it chooses to escape.
* Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring them. ↵Jeremy Kemper2012-10-061-1/+0
| | | | No sense over-testing this MRI-specific behavior. See ruby/ruby@8d6add973ebcb3b4c1efbfaf07786550a3e219af
* Fix nodoc commentRafael Mendonça França2012-10-071-16/+15
|
* More Ruby 1.9 hash syntax.Rafael Mendonça França2012-10-061-52/+47
|
* We don't need to check blank? here.Rafael Mendonça França2012-10-061-1/+1
| | | | | | | | Also the blank? check introduced a bug. $ rails generate model Foo blank:boolean form_for(Foo.new(:blank => true)) => ArgumentError, "First argument in form cannot contain nil or be empty"
* Update some code styles.Rafael Mendonça França2012-10-062-200/+228
| | | | | * Uses the Ruby 1.9 hash syntax * Avoid escaping " inside string using the %{} syntax
* Merge pull request #6475 from joefiorini/responsive-guidesXavier Noria2012-10-069-234/+648
|\ | | | | Responsive guides
| * [Guides] Format content for small devicesJoe Fiorini2012-10-066-5/+163
| |
| * [Guides] Navigation styling for small devicesJoe Fiorini2012-10-065-231/+487
| |
* | Merge pull request #7864 from teleological/link_to_remote_masterRafael Mendonça França2012-10-063-2/+21
|\ \ | | | | | | Accept :remote as symbol in link_to options
| * | Accept :remote as symbol in link_to optionsRiley Lynch2012-10-063-2/+21
| |/ | | | | | | | | Accept either :remote or 'remote' in both the html_options and (url_)options hash arguments to link_to.
* | Remove unneeded requireRafael Mendonça França2012-10-061-1/+0
| |
* | Move multiparameter attributes related tests to its own fileRafael Mendonça França2012-10-062-337/+351
|/
* Merge pull request #7848 from senny/3415_assert_template_has_nil_variableRafael Mendonça França2012-10-063-4/+24
|\ | | | | can't pass :locals to #assert_template without a view test case (#3415)
| * can't pass :locals to #assert_template without a view test case. Closes #3415Yves Senn2012-10-063-4/+24
|/ | | | | | | | | | | the documentation on #assert_template states that the :locals option is only available in view test cases: # In a view test case, you can also assert that specific locals are passed # to partials: I added a warning when it's passed in an inapropriate context to prevent a NoMethodError.
* Merge pull request #7862 from frodsan/rename_private_methodSantiago Pastorino2012-10-051-2/+2
|\ | | | | rename private method to avoid overriding
| * rename private method to avoid overridingFrancesco Rodriguez2012-10-061-2/+2
|/
* Merge pull request #7850 from ↵Rafael Mendonça França2012-10-053-1/+10
|\ | | | | | | | | senny/5920_postgres_adapter_table_with_capital_letters postgres, quote table names when fetching the primary key (#5920)
| * PostgreSQL, quote table names when fetching the primary key. Closes #5920Yves Senn2012-10-053-1/+10
| |
* | We don't need the each call since grep take a block and yield each matchRafael Mendonça França2012-10-061-1/+1
| | | | | | | | | | | | to the block. Thanks @tenderlove
* | Merge pull request #7861 from frodsan/test_backtraceRafael Mendonça França2012-10-053-1/+6
|\ \ | | | | | | use Rails backtrace in tests
| * | use Rails backtrace in testsFrancesco Rodriguez2012-10-052-0/+5
| | |
| * | bump minitest version ~> 4.1.0Francesco Rodriguez2012-10-051-1/+1
|/ /
* | Allow parameter filters to match multi-parameter attributesRafael Mendonça França2012-10-052-0/+34
| | | | | | | | | | | | | | This will make easier to permit date/time attributes generated by helpers like date_select. [Sven Schwyn + Rafael Mendonça França]
* | Merge pull request #7854 from guilleiguaran/extract-rack-cacheRafael Mendonça França2012-10-051-0/+2
|\ \ | | | | | | Fix middleware cache tests enabling rack_cache
| * | Fix middleware cache tests enabling rack_cacheGuillermo Iguaran2012-10-051-0/+2
|/ /
* | Merge pull request #7852 from rochefort/fix-exampleJeremy Kemper2012-10-051-1/+1
|\ \ | | | | | | fix Example: Rename tools/profile_requires -> tools/profile
| * | fix Example: Rename tools/profile_requires -> tools/profilerochefort2012-10-061-1/+1
|/ /
* | Revert "Use flat_map { } instead of map {}.flatten"Santiago Pastorino2012-10-0517-26/+26
| | | | | | | | | | | | | | | | | | | | | | This reverts commit abf8de85519141496a6773310964ec03f6106f3f. We should take a deeper look to those cases flat_map doesn't do deep flattening. irb(main):002:0> [[[1,3], [1,2]]].map{|i| i}.flatten => [1, 3, 1, 2] irb(main):003:0> [[[1,3], [1,2]]].flat_map{|i| i} => [[1, 3], [1, 2]]
* | Use flat_map { } instead of map {}.flattenSantiago Pastorino2012-10-0517-26/+26
| |
* | Fix the coffee-rails dependecy versionRafael Mendonça França2012-10-051-1/+2
|/
* Merge pull request #7838 from guilleiguaran/extract-rack-cacheSantiago Pastorino2012-10-046-11/+33
|\ | | | | Disable Rack::Cache by default
| * Update CHANGELOG entry about rack-cache extractGuillermo Iguaran2012-10-041-3/+7
| |
| * Comment rack-cache entry on GemfileGuillermo Iguaran2012-10-041-1/+1
| |
| * config.action_dispatch.rack_cache should set explicitly to enable Rack::CacheGuillermo Iguaran2012-10-044-7/+25
|/
* Use String#exclude? to make sure that Active Support is not loaded whenRafael Mendonça França2012-10-041-1/+1
| | | | | | | bare is true. We need to change this since coffee-rails loads ActionView that loads core_ext/array/access.
* Remove action cache related testsRafael Mendonça França2012-10-041-42/+0
|
* Strip heredoc to not generate the Gemfile with trailing spacesRafael Mendonça França2012-10-041-2/+2
|
* Add turbolinks as development dependencyRafael Mendonça França2012-10-041-0/+1
|
* Remove unneeded CHANGELOG entry.Rafael Mendonça França2012-10-041-3/+0
| | | | | | | This was added in Rails 4 and we don't need changelog entries to behavior changes [ci skip]
* Merge pull request #7847 from bloudermilk/recursive_permitDavid Heinemeier Hansson2012-10-043-0/+15
|\ | | | | ActionController::Parameters#permit! is recursive
| * ActionController::Parameters#permit! is recursiveBrendan Loudermilk2012-10-043-0/+15
| |
* | Do not set removed optionRafael Mendonça França2012-10-041-1/+0
| | | | | | | | | | Sine page caching was remove from the core we don't have the page_cache_directory anymore
* | Turn turbolinks on by default for new appsDavid Heinemeier Hansson2012-10-043-4/+11
|/
* Merge pull request #7833 from frodsan/extract_ap_pages_actions_cachingRafael Mendonça França2012-10-048-1138/+65
|\ | | | | Extract AP Page and Action caching from Rails
| * add an entry about AP page and action extraction in the upgrading guide [ci ↵Francesco Rodriguez2012-10-041-0/+7
| | | | | | | | skip]
| * add CHANGELOG entry for AP page and action caching extraction [ci skip]Francesco Rodriguez2012-10-041-0/+11
| |
| * rename page_cache_extension option to default_static_extensionFrancesco Rodriguez2012-10-033-11/+28
| |
| * extract AP Page and Action caching to actionpack-deprecated_caching gemFrancesco Rodriguez2012-10-035-1138/+30
| |
* | Merge pull request #7846 from ahaymond/masterRafael Mendonça França2012-10-041-2/+2
|\ \ | | | | | | Updated comments for [ci skip]