aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Everyone is running bundler, no need for defensive programming shitDavid Heinemeier Hansson2012-10-081-2/+2
| | | | |
* | | | | Not precompiling your assets for production is a bad idea -- do not encourage itDavid Heinemeier Hansson2012-10-081-6/+2
| | | | |
* | | | | Merge pull request #7872 from kennyj/should_use_app_pathsJosé Valim2012-10-081-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Should use app.paths instead of specific path.
| * | | | | Should use app.paths instead of specific path.kennyj2012-10-081-1/+2
|/ / / / /
* | | | | Merge pull request #6282 from alexeymuranov/rename-fixtures-classRafael Mendonça França2012-10-0714-63/+83
|\ \ \ \ \ | | | | | | | | | | | | Rename "ActiveRecord::Fixtures" to "ActiveRecord::FixtureSet"
| * | | | | Add CHANGELOG entry for "Fixtures" -> "FixtureSet"Alexey Muranov2012-10-071-1/+13
| | | | | |
| * | | | | Move/rename files to follow naming conventionsAlexey Muranov2012-10-073-1/+1
| | | | | |
| * | | | | Deprecate "Fixtures" constantAlexey Muranov2012-10-071-0/+8
| | | | | |
| * | | | | Rename "Fixtures" class to "FixtureSet"Alexey Muranov2012-10-0713-61/+61
| | | | | | | | | | | | | | | | | | | | | | | | Rename `ActiveRecord::Fixtures` class to `ActiveRecord::FixtureSet`. Instances of this class normally hold a collection of fixtures (records) loaded either from a single YAML file, or from a file and a folder with the same name. This change make the class name singular and makes the class easier to distinguish from the modules like `ActiveRecord::TestFixtures`, which operates on multiple fixture sets, or `DelegatingFixtures`, `::Fixtures`, etc., and from the class `ActiveRecord::Fixture`, which corresponds to a single fixture.
* | | | | | Merge pull request #7869 from Locke23rus/actionmailer_new_hash_syntaxRafael Mendonça França2012-10-0715-169/+169
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update actionmailer with new hash syntax. Just to make clear we don't accept this kind of pull request because it can invalidate a lot of pull requests. I'm accepting this because Action Mailer has only two open pull requests.
| * | | | | Update actionmailer with new hash syntax.Kirill Nikitin2012-10-0715-169/+169
|/ / / / /
* | | | | 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.
| * | | | | 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 ↵Jeremy Kemper2012-10-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entire requests with grep -v without leaving a stray newline behind. Example: # Tag asset requests so it's easy to filter them from dev logs config.log_tags = [ -> request { :assets if request.path.starts_with?(config.assets.prefix) }, -> request { request.uuid } ] # Watch the logs, ignoring asset requests $ tail -100f log/development.log | grep -v assets
* | | | | | 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 ↵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