Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #6475 from joefiorini/responsive-guides | Xavier Noria | 2012-10-06 | 9 | -234/+648 | |
|\ \ \ \ | | | | | | | | | | | Responsive guides | |||||
| * | | | | [Guides] Format content for small devices | Joe Fiorini | 2012-10-06 | 6 | -5/+163 | |
| | | | | | ||||||
| * | | | | [Guides] Navigation styling for small devices | Joe Fiorini | 2012-10-06 | 5 | -231/+487 | |
| | | | | | ||||||
* | | | | | Merge pull request #7864 from teleological/link_to_remote_master | Rafael Mendonça França | 2012-10-06 | 3 | -2/+21 | |
|\ \ \ \ \ | | | | | | | | | | | | | Accept :remote as symbol in link_to options | |||||
| * | | | | | Accept :remote as symbol in link_to options | Riley Lynch | 2012-10-06 | 3 | -2/+21 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | Accept either :remote or 'remote' in both the html_options and (url_)options hash arguments to link_to. | |||||
* | | | | | Remove unneeded require | Rafael Mendonça França | 2012-10-06 | 1 | -1/+0 | |
| | | | | | ||||||
* | | | | | Move multiparameter attributes related tests to its own file | Rafael Mendonça França | 2012-10-06 | 2 | -337/+351 | |
|/ / / / | ||||||
* | | | | Merge pull request #7848 from senny/3415_assert_template_has_nil_variable | Rafael Mendonça França | 2012-10-06 | 3 | -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 #3415 | Yves Senn | 2012-10-06 | 3 | -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_method | Santiago Pastorino | 2012-10-05 | 1 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | rename private method to avoid overriding | |||||
| * | | | | rename private method to avoid overriding | Francesco Rodriguez | 2012-10-06 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #7850 from ↵ | Rafael Mendonça França | 2012-10-05 | 3 | -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 #5920 | Yves Senn | 2012-10-05 | 3 | -1/+10 | |
| | | | | | ||||||
* | | | | | We don't need the each call since grep take a block and yield each match | Rafael Mendonça França | 2012-10-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the block. Thanks @tenderlove | |||||
* | | | | | Merge pull request #7861 from frodsan/test_backtrace | Rafael Mendonça França | 2012-10-05 | 3 | -1/+6 | |
|\ \ \ \ \ | | | | | | | | | | | | | use Rails backtrace in tests | |||||
| * | | | | | use Rails backtrace in tests | Francesco Rodriguez | 2012-10-05 | 2 | -0/+5 | |
| | | | | | | ||||||
| * | | | | | bump minitest version ~> 4.1.0 | Francesco Rodriguez | 2012-10-05 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Allow parameter filters to match multi-parameter attributes | Rafael Mendonça França | 2012-10-05 | 2 | -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-cache | Rafael Mendonça França | 2012-10-05 | 1 | -0/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix middleware cache tests enabling rack_cache | |||||
| * | | | | | Fix middleware cache tests enabling rack_cache | Guillermo Iguaran | 2012-10-05 | 1 | -0/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #7852 from rochefort/fix-example | Jeremy Kemper | 2012-10-05 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | fix Example: Rename tools/profile_requires -> tools/profile | |||||
| * | | | | | fix Example: Rename tools/profile_requires -> tools/profile | rochefort | 2012-10-06 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Revert "Use flat_map { } instead of map {}.flatten" | Santiago Pastorino | 2012-10-05 | 17 | -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 {}.flatten | Santiago Pastorino | 2012-10-05 | 17 | -26/+26 | |
| | | | | | ||||||
* | | | | | Fix the coffee-rails dependecy version | Rafael Mendonça França | 2012-10-05 | 1 | -1/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #7838 from guilleiguaran/extract-rack-cache | Santiago Pastorino | 2012-10-04 | 6 | -11/+33 | |
|\ \ \ \ | | | | | | | | | | | Disable Rack::Cache by default | |||||
| * | | | | Update CHANGELOG entry about rack-cache extract | Guillermo Iguaran | 2012-10-04 | 1 | -3/+7 | |
| | | | | | ||||||
| * | | | | Comment rack-cache entry on Gemfile | Guillermo Iguaran | 2012-10-04 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | config.action_dispatch.rack_cache should set explicitly to enable Rack::Cache | Guillermo Iguaran | 2012-10-04 | 4 | -7/+25 | |
|/ / / / | ||||||
* | | | | Use String#exclude? to make sure that Active Support is not loaded when | Rafael Mendonça França | 2012-10-04 | 1 | -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 tests | Rafael Mendonça França | 2012-10-04 | 1 | -42/+0 | |
| | | | | ||||||
* | | | | Strip heredoc to not generate the Gemfile with trailing spaces | Rafael Mendonça França | 2012-10-04 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Add turbolinks as development dependency | Rafael Mendonça França | 2012-10-04 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Remove unneeded CHANGELOG entry. | Rafael Mendonça França | 2012-10-04 | 1 | -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_permit | David Heinemeier Hansson | 2012-10-04 | 3 | -0/+15 | |
|\ \ \ \ | | | | | | | | | | | ActionController::Parameters#permit! is recursive | |||||
| * | | | | ActionController::Parameters#permit! is recursive | Brendan Loudermilk | 2012-10-04 | 3 | -0/+15 | |
| | | | | | ||||||
* | | | | | Do not set removed option | Rafael Mendonça França | 2012-10-04 | 1 | -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 apps | David Heinemeier Hansson | 2012-10-04 | 3 | -4/+11 | |
|/ / / / | ||||||
* | | | | Merge pull request #7833 from frodsan/extract_ap_pages_actions_caching | Rafael Mendonça França | 2012-10-04 | 8 | -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 Rodriguez | 2012-10-04 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | | | skip] | |||||
| * | | | | add CHANGELOG entry for AP page and action caching extraction [ci skip] | Francesco Rodriguez | 2012-10-04 | 1 | -0/+11 | |
| | | | | | ||||||
| * | | | | rename page_cache_extension option to default_static_extension | Francesco Rodriguez | 2012-10-03 | 3 | -11/+28 | |
| | | | | | ||||||
| * | | | | extract AP Page and Action caching to actionpack-deprecated_caching gem | Francesco Rodriguez | 2012-10-03 | 5 | -1138/+30 | |
| | | | | | ||||||
* | | | | | Merge pull request #7846 from ahaymond/master | Rafael Mendonça França | 2012-10-04 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Updated comments for [ci skip] | |||||
| * | | | | | Update activerecord/lib/active_record/persistence.rb | Adam Haymond | 2012-10-04 | 1 | -2/+2 | |
|/ / / / / | | | | | | | | | | | - Changed the comments documentation for the update_column(s) methods to add a little bit of clarity | |||||
* | | | | | Merge pull request #7769 from rgarver/feature/public-fragment_name_with_digest | David Heinemeier Hansson | 2012-10-04 | 1 | -11/+12 | |
|\ \ \ \ \ | | | | | | | | | | | | | Move the CacheHelper#fragment_name_with_digest to be public | |||||
| * | | | | | Add nodoc to now public fragment_name_with_digest | Ryan Garver | 2012-10-04 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' into feature/public-fragment_name_with_digest | Ryan Garver | 2012-10-04 | 14 | -10/+122 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
* | | | | | | Fix CHANGELOG entry [ci skip] | Rafael Mendonça França | 2012-10-04 | 1 | -4/+4 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #6978 from frodsan/count_nosql_unsaved_parent | Rafael Mendonça França | 2012-10-03 | 5 | -0/+37 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Count returns 0 without querying if parent is not saved |