Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #8647 from nishantmodak/patch-2 | Vijay Dev | 2012-12-29 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Update documentation for yml usage | |||||
| * | | | Update documentation for yml usage | Nishant Modak | 2012-12-30 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Rails 4.0 is going to depend on Rack 1.5.x so let's test against Rack master | Santiago Pastorino | 2012-12-29 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Merge pull request #8650 from codeodor/patch-1 | Guillermo Iguaran | 2012-12-29 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Fix up/down column change example code formatting | |||||
| * | | | | Fix up/down column change example code formatting | Sammy Larbi | 2012-12-29 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | add missing require and fixtures | Aaron Patterson | 2012-12-29 | 1 | -0/+3 | |
| | | | | ||||||
* | | | | fix time typcasting on group counts in PG | Aaron Patterson | 2012-12-28 | 2 | -2/+11 | |
| | | | | ||||||
* | | | | mysql does not return alias names, so fall back | Aaron Patterson | 2012-12-28 | 1 | -4/+10 | |
|/ / / | ||||||
* | | | Test that assert_not returns true. Use assert_raises instead of doing ↵ | Jeremy Kemper | 2012-12-28 | 1 | -17/+7 | |
| | | | | | | | | | | | | begin/rescue/else. | |||||
* | | | fix PG typecasting errors | Aaron Patterson | 2012-12-28 | 2 | -22/+12 | |
| | | | ||||||
* | | | Merge pull request #8644 from acapilleri/abstract_mysql | Rafael Mendonça França | 2012-12-28 | 1 | -2/+6 | |
|\ \ \ | | | | | | | | | small refactoring, added blob_or_text_colum? in AbstractMysqlAdapter | |||||
| * | | | small refactoring, added blob_or_text_colum? in AbstractMysqlAdapter | Angelo Capilleri | 2012-12-28 | 1 | -2/+6 | |
|/ / / | ||||||
* | | | Merge pull request #8636 from senny/work_off_fixme_in_rename_column_test | Rafael Mendonça França | 2012-12-28 | 1 | -9/+22 | |
|\ \ \ | | | | | | | | | work off FIXME in rename_column_test | |||||
| * | | | work off FIXME comments in AR rename_column_test.rb | Yves Senn | 2012-12-28 | 1 | -9/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | There were a couple of tests, which had FIXME comments in palce of assertions. I replaced these FIXME comments with actual assertions to get more feedback from our test suite. | |||||
* | | | | Revert "Install binstubs by default" | Jeremy Kemper | 2012-12-28 | 2 | -4/+4 | |
|/ / / | | | | | | | | | | | | | | | | This reverts commit f34c27a452418d8aa17f92bb0fd7ae97b5f7e252. We'll be taking a different tack on this with new `bundle binstubs <gem>` support. | |||||
* | / | Revert "Detect rbenv and update the shebang" | Jeremy Kemper | 2012-12-28 | 3 | -18/+1 | |
| |/ |/| | | | | | | | This reverts commit 7173c4f931c9026bd3bc0b644d93dae744433f09. This reverts commit a562f9fa09967eba26dff1c3bc8aa85b6f0a72ff. | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-29 | 2 | -5/+1 | |
|\ \ | ||||||
| * | | Revert "Add rake test description" | Vijay Dev | 2012-12-29 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a3309caf338830849acd826bc6ad14f972e787db. Reason: docrails isn't the place to do this. [ci skip] | |||||
| * | | Revert "Add rake default to description" | Vijay Dev | 2012-12-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0d8ca8124de9b3a5f6398a28d79baca935a1f96c. Reason: docrails isn't the place to do this. Also, I feel this is not really required. [ci skip] | |||||
| * | | Revert "reminder to run bundle after setting up rails-dev-box" | Vijay Dev | 2012-12-29 | 1 | -7/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 41381c19d1f3920ee9540aff0d35209cb43fb057. Reason: This doesn't quite fit the flow where it's added. Let's add this someplace else if it's explicitly required. [ci skip] | |||||
| * | | Fixed couple of typos | Fabrizio Regini | 2012-12-27 | 1 | -1/+1 | |
| | | | ||||||
| * | | removed TIP: :allow_nil/:allow_blank is ignored by the presence validator | Colin Kelley | 2012-12-26 | 1 | -4/+0 | |
| | | | | | | | | | | | | These tips were documenting an inconsistency issue https://github.com/rails/rails/issues/8621. That issue is resolved by https://github.com/rails/rails/issues/8622. | |||||
| * | | reminder to run bundle after setting up rails-dev-box | Ace Suares | 2012-12-24 | 1 | -0/+7 | |
| | | | ||||||
| * | | Add rake test description | sanemat | 2012-12-24 | 1 | -0/+2 | |
| | | | ||||||
| * | | Add rake default to description | sanemat | 2012-12-24 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #8641 from arunagw/warning_removed_unused_var | Steve Klabnik | 2012-12-28 | 1 | -1/+2 | |
|\ \ \ | | | | | | | | | Remove 'assigned but unused variable' warning | |||||
| * | | | Remove 'assigned but unused variable' warning | Arun Agrawal | 2012-12-28 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | Introduce assert_not to replace 'assert !foo' | Jeremy Kemper | 2012-12-28 | 3 | -0/+39 | |
|/ / / | ||||||
* | | | Consistent punctuation for @jaroslawr :bowtie: | Jeremy Kemper | 2012-12-27 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #8634 from senny/rewrite_order_dependent_test_case | Rafael Mendonça França | 2012-12-27 | 1 | -1/+2 | |
|\ \ \ | | | | | | | | | rewrite order dependent test case | |||||
| * | | | rewrite order dependent test case. #8185 | Yves Senn | 2012-12-27 | 1 | -1/+2 | |
|/ / / | | | | | | | | | | | | | | | | As reported (https://github.com/rails/rails/pull/8185#issuecomment-11702226) this test relied on the order a hash was serialized. Comparing the parsed hash makes the test no longer order dependent. | |||||
* | | | Merge pull request #8627 from schneems/schneems/routes-1-9 | Rafael Mendonça França | 2012-12-26 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Ruby 1.9 style hash in Route Inspector | |||||
| * | | | Ruby 1.9 style hash in Route Inspector | schneems | 2012-12-27 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Make test logs easier to read. | Jeremy Kemper | 2012-12-26 | 2 | -13/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Tagging every message in tests makes the logs really wide. It's great for grepping, but annoying to open in an editor or a narrow terminal. Try out a different approach: spit out a heading before each test. | |||||
* | | | | Extract the component rendering of collection_radio_buttons and | Rafael Mendonça França | 2012-12-26 | 2 | -2/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collection_check_boxes to a private method. It will make easier to extend. Example: class CollectionRadioButtons < ActionView::Helpers::Tags::CollectionRadioButtons include CollectionExtensions def render wrap_rendered_collection(super, @options) end private def render_component(builder) builder.radio_button + builder.label(:class => "collection_radio_buttons") end end | |||||
* | | | | Fix collection_radio_buttons with the option `:checked` with value of | Rafael Mendonça França | 2012-12-26 | 2 | -1/+8 | |
| | | | | | | | | | | | | | | | | `false` | |||||
* | | | | This change doesn't need a CHANGELOG entry. | Rafael Mendonça França | 2012-12-26 | 1 | -5/+0 | |
| | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | Add CHANGELOG entry for #8622 | Rafael Mendonça França | 2012-12-26 | 2 | -2/+7 | |
| | | | | ||||||
* | | | | Merge pull request #8598 from NARKOZ/refactor-highlight | Santiago Pastorino | 2012-12-26 | 1 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | refactor highlight method: return fast if text or phrases are blank | |||||
| * | | | | fetch highlighter option only when needed | Nihad Abbasov | 2012-12-24 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Revert the change at ActiveModel::Errors#add_on_blank and fix in the | Rafael Mendonça França | 2012-12-26 | 3 | -14/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | right place. The EachValidator#validate already handle :allow_blank and :allow_nil, correctly. Closes #8622. Fix #8621. | |||||
* | | | | | Tests and fix for validates_presence of :allow_nil, :allow_blank | Colin Kelley | 2012-12-26 | 2 | -1/+41 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activemodel/lib/active_model/errors.rb | |||||
* | | | | | Note about migration timestamps. | Steve Klabnik | 2012-12-26 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should mention that the ordering matters with regards to timestamps, and not imply that it's just for uniqueness purposes. Closes #8610. | |||||
* | | | | | Consistent use of single and double quotes | Rafael Mendonça França | 2012-12-26 | 1 | -10/+10 | |
| | | | | | ||||||
* | | | | | Merge pull request #8616 from senny/8612_respect_yaml_keywords | Rafael Mendonça França | 2012-12-26 | 4 | -7/+48 | |
|\ \ \ \ \ | | | | | | | | | | | | | quote column names in generated fixture files | |||||
| * | | | | | quote column names in generated fixture files | Yves Senn | 2012-12-26 | 4 | -7/+48 | |
| | | | | | | ||||||
* | | | | | | Fix CHANGELOG style [ci skip] | Rafael Mendonça França | 2012-12-26 | 2 | -6/+6 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #5100 from ↵ | Rafael Mendonça França | 2012-12-26 | 3 | -6/+29 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | paukul/validate_on_condition_on_transaction_callbacks Validate :on option on after_commit and after_rollback callbacks | |||||
| * | | | | | | validate :on option on after_commit and after_rollback callbacks | Pascal Friederich | 2012-12-26 | 3 | -6/+29 | |
| | | | | | | | ||||||
* | | | | | | | We need to check explictly that env['action_dispatch.show_exceptions'] | Rafael Mendonça França | 2012-12-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is false. If it is nil we can't raise the exception |