aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* explains why these requires are in an unusual placeXavier Noria2012-10-071-0/+8
* Merge pull request #7650 from kennyj/fix_warning_20120915Xavier Noria2012-10-071-6/+7
|\
| * Fix warning: circular require considered harmful.kennyj2012-10-031-6/+7
* | adds a CHANGELOG for guides and registers the new responsive designXavier Noria2012-10-071-0/+3
* | Gotta log each spacer line separately to ensure each is taggedJeremy Kemper2012-10-061-1/+4
* | Tag the blank log line between dev requests so it's easier to filter out enti...Jeremy Kemper2012-10-061-3/+3
* | Remove unneeded attr_readerRafael Mendonça França2012-10-071-1/+0
* | Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrophes a fe...Jeremy Kemper2012-10-061-1/+1
* | Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring them. N...Jeremy Kemper2012-10-061-1/+0
* | 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
* | Update some code styles.Rafael Mendonça França2012-10-062-200/+228
* | Merge pull request #6475 from joefiorini/responsive-guidesXavier Noria2012-10-069-234/+648
|\ \
| * | [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 optionsRiley Lynch2012-10-063-2/+21
| |/ /
* | | 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. Closes #3415Yves Senn2012-10-063-4/+24
|/ /
* | Merge pull request #7862 from frodsan/rename_private_methodSantiago Pastorino2012-10-051-2/+2
|\ \
| * | rename private method to avoid overridingFrancesco Rodriguez2012-10-061-2/+2
|/ /
* | Merge pull request #7850 from senny/5920_postgres_adapter_table_with_capital_...Rafael Mendonça França2012-10-053-1/+10
|\ \
| * | 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
* | | Merge pull request #7861 from frodsan/test_backtraceRafael Mendonça França2012-10-053-1/+6
|\ \ \
| * | | 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
* | | Merge pull request #7854 from guilleiguaran/extract-rack-cacheRafael Mendonça França2012-10-051-0/+2
|\ \ \
| * | | 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/profilerochefort2012-10-061-1/+1
|/ / /
* | | Revert "Use flat_map { } instead of map {}.flatten"Santiago Pastorino2012-10-0517-26/+26
* | | 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
|\ \
| * | 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
* | 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
* | Merge pull request #7847 from bloudermilk/recursive_permitDavid Heinemeier Hansson2012-10-043-0/+15
|\ \
| * | ActionController::Parameters#permit! is recursiveBrendan Loudermilk2012-10-043-0/+15
* | | Do not set removed optionRafael Mendonça França2012-10-041-1/+0