aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #7506 from senny/issue_7503Rafael Mendonça França2012-09-035-2/+38
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | #becomes works with configured inheritance_column
| * | | | | | set the configured #inheritance_column on #become (#7503)Yves Senn2012-09-035-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had to create a new table because I needed an STI table, which does not have both a "type" and a "custom_type" the test fails with: 1) Error: test_alt_becomes_works_with_sti(InheritanceTest): NoMethodError: undefined method `type=' for #<Cabbage id: 1, name: "my cucumber", custom_type: "Cucumber"> /Users/username/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:432:in `method_missing' /Users/username/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:100:in `method_missing' /Users/username/Projects/rails/activerecord/lib/active_record/persistence.rb:165:in `becomes' test/cases/inheritance_test.rb:134:in `test_becomes_works_with_sti' test/cases/inheritance_test.rb:140:in `test_alt_becomes_works_with_sti'
* | | | | | | Merge pull request #7502 from xoen/fixed-upgrading-guide-markupCarlos Antonio da Silva2012-09-021-2/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed markup in Upgrading RoR guide [ci skip]
| * | | | | | | Fixed markup in Upgrading RoR guide [ci skip]Aldo "xoen" Giambelluca2012-09-021-2/+12
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two changes: - Using <ruby> syntax for unicode character routes example instead of <tt> since it causes single quotes to be transformed into inverted commas. This makes this required change more eye-catching. - Using <tt> for the j alias and related helpers as written in the documentation guidelines.
* | | | | | | Merge pull request #7504 from behrends/patch-1Carlos Antonio da Silva2012-09-021-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix example code: use tasks instead of comments [ci skip]
| * | | | | | Fix example code: use tasks instead of commentsErik Behrends2012-09-021-1/+1
|/ / / / / /
* | | | | | Merge pull request #7495 from steveklabnik/issue_7478Aaron Patterson2012-09-013-4/+18
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Properly reset the session on reset_session
| * | | | | Force reloading of the session after destroyAndreas Loupasakis2012-09-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use load_for_write! to ensure a refresh of the session object. This way the new session_id and the empty data will be stored properly. E.g. in the case of the session cookie store this means that a new digest will be returned to the user.
| * | | | | Override rack's destroy_session in cookie storeAndreas Loupasakis2012-09-011-0/+8
| | | | | |
| * | | | | Assign a new session_id to session options hashAndreas Loupasakis2012-09-011-2/+2
| | | | | |
| * | | | | Properly reset the session on reset_sessionSteve Klabnik2012-08-311-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #7478
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-0117-36/+111
|\ \ \ \ \ \
| * | | | | | copy edits [ci skip]Vijay Dev2012-09-012-4/+2
| | | | | | |
| * | | | | | Revert "added .DS_Store to .gitignore"Vijay Dev2012-09-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fc80ebb13328eb5f233f65408ba281bf0f8ce68e. Such changes aren't allowed in docrails.
| * | | | | | reverting changes from commit b0896c38Sven Kraeuter | 5v3n2012-09-011-1/+1
| | | | | | |
| * | | | | | Fix comment about Session.Steve Klabnik2012-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SessionHash isn't a thing, and tenses are wrong.
| * | | | | | Fix my bioPratik Naik2012-08-311-1/+1
| | | | | | |
| * | | | | | Merge pull request #111 from 5v3n/masterSven Kräuter2012-08-311-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed little mistake in the docs
| | * | | | | | there is no "delete" action in a controllerSven Kräuter2012-08-311-1/+1
| |/ / / / / /
| * | | | | | In example about params naming conventions use params[:person] [ci skip]Aldo "xoen" Giambelluca2012-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example is about a Person model, say that "params[:model] would usually be a hash of all the attributes for the person to create" could be confusing. I changed to params[:person] since the example is about a Person creation.
| * | | | | | Merge pull request #106 from neilstockbridge/masterJeff Shantz2012-08-301-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Added a bullet for :enable_starttls_auto in the smtp_settings table
| | * | | | | | Added a note for smtp_settings.enable_starttls_autoNeil Stockbridge2012-08-081-1/+1
| | | | | | | |
| * | | | | | | in section 4.1 acts_as_yaffle_test was incorrectly failing due to assertion ↵Kevin Musiorski2012-08-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incorrectly using symbol instead of string
| * | | | | | | added .DS_Store to .gitignoreKevin Musiorski2012-08-301-0/+1
| | | | | | | |
| * | | | | | | Added example of using options_for_select() with select_tag()Kir Shatrov2012-08-301-0/+4
| | | | | | | |
| * | | | | | | Removed spaces between name and asterisks in example CHANGELOG entry [ci skip]Aldo "xoen" Giambelluca2012-08-301-1/+1
| | | | | | | |
| * | | | | | | Expand documentation for change() method in Time, Date, and DateTimeJeff Shantz2012-08-293-4/+15
| | | | | | | |
| * | | | | | | Revert "Grammar"Jo Liss2012-08-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per https://github.com/lifo/docrails/commit/e94e8d8c3fcac624466afcf61f6a118abe5a6af4#commitcomment-1784677 Thanks @randomecho! This reverts commit e94e8d8c3fcac624466afcf61f6a118abe5a6af4.
| * | | | | | | GrammarJo Liss2012-08-291-3/+3
| | | | | | | |
| * | | | | | | Merge pull request #110 from nmadura/masterNathaniel Madura2012-08-291-0/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | minor update to asset_pipeline docs describing apache config
| | * | | | | | | added a touch more information to the apache configuration instructionsNathaniel Madura2012-08-291-0/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the text there is a section about how to serve the assets with far-future headers. The snippet that is proposed doesn't work on Ubuntu 11 (probably others) as mod_expires is not enabled out-of-the-box. I noted this, and gave an example of how to load mod_expires with a2enmod.
| * | | | | | | Merge pull request #109 from aantix/default_security_headers_clarificationsJim Jones2012-08-281-1/+19
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added clairifications for default security headers.
| | * | | | | | | Added clairifications for default security headers.Jim Jones2012-08-271-1/+19
| |/ / / / / / /
| * | | | | | | Merge pull request #108 from homakov/masterEgor Homakov2012-08-271-0/+23
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Default headers description
| | * | | | | | | default headers initEgor Homakov2012-08-271-0/+23
| |/ / / / / / /
| * | | | | | | Update guides/source/rails_application_templates.textileDeepak Kannan2012-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | think that a quoted string will be better as it will automatically escape double-quotes as well
| * | | | | | | Minor update for usage of git commandDeepak Kannan2012-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after running, git add . do not need -a option to git commit
| * | | | | | | Guide: improvements to "The Flash" section.Henrik N2012-08-251-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct :error -> :alert, mention FlashHash class, mention that you're not limited to notices and alerts, clean up.
| * | | | | | | Merge pull request #107 from jaimeiniesta/masterXavier Noria2012-08-241-8/+13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix rake guides:validate
| | * | | | | | | Add exception handling to rake guides:validateJaime Iniesta2012-08-241-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the validation of a guide encounters an exception, inform about it and continue with the loop to validate the rest.
| | * | | | | | | Fix rake guides:validateJaime Iniesta2012-08-241-7/+7
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This rake task was looking for the output folder in the wrong place.
| * | | | | | | Revert "Fix rake guides:validate task as it should be run from the guides ↵Jaime Iniesta2012-08-241-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directory; add exception handling" This kind of changes should go on a pull request instead. This reverts commit ecae2f0ef0452f8d333525a6aed58e5ab8d3ccb1.
| * | | | | | | Merge branch 'master' of github.com:lifo/docrailsAlmudena Garcia2012-08-231-8/+13
| |\ \ \ \ \ \ \
| | * | | | | | | Fix rake guides:validate task as it should be run from the guides directory; ↵Jaime Iniesta2012-08-231-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add exception handling
| * | | | | | | | Fix HTML validation errorsAlmudena Garcia2012-08-234-7/+7
| |/ / / / / / /
* | | | | | | | require bundle in the app generatorXavier Noria2012-09-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The app generator is not generally run under bundler, but the Bundler constant is used here. In particular you cannot create --dev apps without this.
* | | | | | | | Remove unneeded requirePiotr Sarnacki2012-09-011-1/+0
| | | | | | | |
* | | | | | | | Merge pull request #7494 from route/actionview_decoupling_issuePiotr Sarnacki2012-09-016-18/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | ActionView decoupling and sprockets-rails tests fail
| * | | | | | | Sprockets-rails tests failDmitry Vorotilin2012-09-016-18/+10
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Method invalid_asset_host! was delegated to controller but sprockets compile assets in their own scope without controller. And if we set asset_host with second parameter it should raise error through invalid_asset_host!. But since controller is nil it cannot be reached.
* | | | | | | Require bundler 1.2Piotr Sarnacki2012-08-311-1/+1
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 22:07:47 +0000