Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | remove another unnecessary dup | Gosha Arinich | 2013-01-02 | 1 | -5/+3 | |
| | | | ||||||
* | | | CVE-2012-5664 options hashes should only be extracted if there are extra ↵ | Aaron Patterson | 2013-01-02 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | parameters Conflicts: activerecord/lib/active_record/dynamic_matchers.rb | |||||
* | | | Merge pull request #8701 from senny/8700_double_slash_with_trailing_slash | Rafael Mendonça França | 2013-01-02 | 3 | -7/+33 | |
|\ \ \ | | | | | | | | | do not append a second slash when using `trailing_slash: true` | |||||
| * | | | do not append a second slash when using | Yves Senn | 2013-01-02 | 3 | -7/+33 | |
| |/ / | ||||||
* | | | Fixing closing </p> | Guillermo Iguaran | 2013-01-02 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #8702 from rubys/master | Guillermo Iguaran | 2013-01-02 | 2 | -8/+7 | |
|\ \ \ | | | | | | | | | Fix a number of validation/style errors | |||||
| * | | | Fix a number of validation/style errors: | Sam Ruby | 2013-01-02 | 2 | -8/+7 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * <pre> is not allowed to be nested inside of <p> elements in HTML * Indentation of </p> doesn't match corresponding <p> * <p> element not explicitly closed * One more </div> than <div> In each case, the template was fixed to match how a HTML5 parser would "see" the resulting page. | |||||
* | | | take into account multipart when calculating tag attributes | Aaron Patterson | 2013-01-02 | 1 | -4/+7 | |
| | | | ||||||
* | | | ask the form builder for form tag attributes | Aaron Patterson | 2013-01-02 | 1 | -2/+3 | |
| | | | ||||||
* | | | do not mutate the options hash (when we do not need to) | Aaron Patterson | 2013-01-02 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #8694 from goshakkk/undup | Carlos Antonio da Silva | 2013-01-02 | 1 | -2/+1 | |
|\ \ | | | | | | | Remove unnecessary #dup | |||||
| * | | remove unnecessary #dup | Gosha Arinich | 2013-01-02 | 1 | -2/+1 | |
| | | | ||||||
* | | | Merge pull request #8688 from goshakkk/error-page-toggle | Guillermo Iguaran | 2013-01-02 | 2 | -3/+7 | |
|\ \ \ | |/ / |/| | | Allow toggling dumps on error page | |||||
| * | | allow toggling dumps instead of just showing | Gosha Arinich | 2013-01-02 | 2 | -3/+7 | |
| | | | ||||||
* | | | Merge pull request #8693 from goshakkk/flatten | Rafael Mendonça França | 2013-01-02 | 1 | -2/+2 | |
|\ \ \ | |_|/ |/| | | Replace #flatten with Array() | |||||
| * | | replace #flatten with Array() | Gosha Arinich | 2013-01-02 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge pull request #8692 from lucasmazza/error-page-css | Rafael Mendonça França | 2013-01-02 | 1 | -12/+13 | |
|\ \ \ | | | | | | | | | Cleanup the CSS on the new error page. | |||||
| * | | | Cleanup some unnecessary CSS on the new error page and reformat some lines. | Lucas Mazza | 2013-01-02 | 1 | -12/+13 | |
| |/ / | ||||||
* | | | Merge pull request #8691 from acapilleri/preload_association | Rafael Mendonça França | 2013-01-02 | 1 | -1/+3 | |
|\ \ \ | |/ / |/| | | refactoring to_sym of Symbol in preload | |||||
| * | | refactoring to_sym of Symbol in preload | Angelo capilleri | 2013-01-02 | 1 | -1/+3 | |
| | | | ||||||
* | | | Merge pull request #8689 from goshakkk/error-page | Rafael Mendonça França | 2013-01-02 | 1 | -0/+4 | |
|\ \ \ | | | | | | | | | Add source code left padding on error pages | |||||
| * | | | add source line padding | Gosha Arinich | 2013-01-02 | 1 | -0/+4 | |
| | |/ | |/| | ||||||
* / | | No need to pass a empty block to content_tag_for anymore | Rafael Mendonça França | 2013-01-02 | 1 | -11/+11 | |
|/ / | ||||||
* | | Make content_tag_for work without block | Rafael Mendonça França | 2013-01-02 | 3 | -1/+17 | |
| | | | | | | | | This is version of #8640 for master | |||||
* | | Merge pull request #8686 from mekishizufu/changelog_entry | Xavier Noria | 2013-01-02 | 1 | -0/+4 | |
|\ \ | |/ |/| | Add missing changelog entry for #8676 [ci skip] | |||||
| * | Add missing changelog entry for #8676 [ci skip] | Jiri Pospisil | 2013-01-02 | 1 | -0/+4 | |
|/ | ||||||
* | Merge pull request #8682 from amatsuda/rm_as_frozen_object_error | Guillermo Iguaran | 2013-01-01 | 7 | -12/+4 | |
|\ | | | | | remove meaningless AS::FrozenObjectError | |||||
| * | remove meaningless AS::FrozenObjectError | Akira Matsuda | 2013-01-02 | 7 | -12/+4 | |
| | | ||||||
* | | Standardize the use of current_adapter? | Rafael Mendonça França | 2013-01-01 | 9 | -19/+19 | |
| | | ||||||
* | | Merge pull request #8678 from yahonda/remove_column_oracle | Rafael Mendonça França | 2013-01-01 | 1 | -2/+3 | |
|\ \ | | | | | | | Address a failure test_remove_column_with_multi_column_index with Oracle | |||||
| * | | Address a failure test_remove_column_with_multi_column_index with Oracle ↵ | Yasuo Honda | 2013-01-02 | 1 | -2/+3 | |
| |/ | | | | | | | | | | | | | database Not only PostgreSQL, Oracle database adapter drops the multi-column index if any of the indexed columns dropped by remove_column. | |||||
* | | Merge pull request #8677 from amatsuda/unused_scope_in_test_models | Rafael Mendonça França | 2013-01-01 | 1 | -2/+0 | |
|\ \ | |/ |/| | unused scope in AR test model | |||||
| * | unused scope | Akira Matsuda | 2013-01-02 | 1 | -2/+0 | |
|/ | ||||||
* | Add entry in Releases Notes about changes in exceptions page | Guillermo Iguaran | 2013-01-01 | 1 | -0/+2 | |
| | ||||||
* | Add CHANGELOG entry for changes in exception pages | Guillermo Iguaran | 2013-01-01 | 1 | -0/+6 | |
| | ||||||
* | update rake tasks output [ci skip] | Vijay Dev | 2013-01-01 | 1 | -1/+1 | |
| | ||||||
* | fix alignment in rails info properties page [ci skip] | Vijay Dev | 2013-01-01 | 1 | -0/+2 | |
| | ||||||
* | Merge pull request #8676 from mekishizufu/skip_bundle_alias | José Valim | 2013-01-01 | 1 | -1/+1 | |
|\ | | | | | Add -B alias for --skip-bundle | |||||
| * | Add -B alias for --skip-bundle | Jiri Pospisil | 2013-01-01 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #8675 from goshakkk/cleanup | José Valim | 2013-01-01 | 1 | -1/+1 | |
|\ | | | | | Remove unnecessary always-nil var from #compact | |||||
| * | remove unnecessary always-nil var from #compact | Gosha Arinich | 2013-01-01 | 1 | -1/+1 | |
|/ | ||||||
* | small fix in js guide [ci skip] | Vijay Dev | 2013-01-01 | 1 | -1/+1 | |
| | ||||||
* | Fix indent in UnknownAction template | Guillermo Iguaran | 2013-01-01 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-01-01 | 6 | -8/+50 | |
|\ | ||||||
| * | copy edits [ci skip] | Vijay Dev | 2013-01-01 | 1 | -4/+3 | |
| | | ||||||
| * | Merge pull request #123 from m-o/master | Vijay Dev | 2013-01-01 | 1 | -1/+1 | |
| |\ | | | | | | | Fixed typo one line in layouts and rendering: stylesheet_link_tag for file in subdirectory. | |||||
| | * | Update guides/source/layouts_and_rendering.md | Marek Ovečka | 2012-12-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | Removed first slash. The subdirectory will nto be found with slash befor it. | |||||
| * | | Improve English | Ruafozy | 2013-01-01 | 1 | -5/+7 | |
| | | | | | | | | | | | | | | | | | | * Fix one error * Improve wording * Improve punctuation | |||||
| * | | Add documentation for TimeWithZone methods | Matthew Stopa | 2012-12-31 | 1 | -3/+19 | |
| | | | ||||||
| * | | Add documentation for the TimeWithZone#dst? method. | Matthew Stopa | 2012-12-31 | 1 | -0/+6 | |
| | | | | | | | | | | | | [ci skip] |