aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Install binstubs by default"Jeremy Kemper2012-12-282-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 Kemper2012-12-283-18/+1
| | | | | This reverts commit 7173c4f931c9026bd3bc0b644d93dae744433f09. This reverts commit a562f9fa09967eba26dff1c3bc8aa85b6f0a72ff.
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-292-5/+1
|\
| * Revert "Add rake test description"Vijay Dev2012-12-291-2/+0
| | | | | | | | | | | | | | | | This reverts commit a3309caf338830849acd826bc6ad14f972e787db. Reason: docrails isn't the place to do this. [ci skip]
| * Revert "Add rake default to description"Vijay Dev2012-12-291-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 Dev2012-12-291-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 typosFabrizio Regini2012-12-271-1/+1
| |
| * removed TIP: :allow_nil/:allow_blank is ignored by the presence validatorColin Kelley2012-12-261-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-boxAce Suares2012-12-241-0/+7
| |
| * Add rake test descriptionsanemat2012-12-241-0/+2
| |
| * Add rake default to descriptionsanemat2012-12-241-1/+1
| |
* | Merge pull request #8641 from arunagw/warning_removed_unused_varSteve Klabnik2012-12-281-1/+2
|\ \ | | | | | | Remove 'assigned but unused variable' warning
| * | Remove 'assigned but unused variable' warningArun Agrawal2012-12-281-1/+2
| | |
* | | Introduce assert_not to replace 'assert !foo'Jeremy Kemper2012-12-283-0/+39
|/ /
* | Consistent punctuation for @jaroslawr :bowtie:Jeremy Kemper2012-12-271-1/+1
| |
* | Merge pull request #8634 from senny/rewrite_order_dependent_test_caseRafael Mendonça França2012-12-271-1/+2
|\ \ | | | | | | rewrite order dependent test case
| * | rewrite order dependent test case. #8185Yves Senn2012-12-271-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-9Rafael Mendonça França2012-12-261-1/+1
|\ \ | | | | | | Ruby 1.9 style hash in Route Inspector
| * | Ruby 1.9 style hash in Route Inspectorschneems2012-12-271-1/+1
| | |
* | | Make test logs easier to read.Jeremy Kemper2012-12-262-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 andRafael Mendonça França2012-12-262-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 ofRafael Mendonça França2012-12-262-1/+8
| | | | | | | | | | | | `false`
* | | This change doesn't need a CHANGELOG entry.Rafael Mendonça França2012-12-261-5/+0
| | | | | | | | | | | | [ci skip]
* | | Add CHANGELOG entry for #8622Rafael Mendonça França2012-12-262-2/+7
| | |
* | | Merge pull request #8598 from NARKOZ/refactor-highlightSantiago Pastorino2012-12-261-2/+2
|\ \ \ | | | | | | | | refactor highlight method: return fast if text or phrases are blank
| * | | fetch highlighter option only when neededNihad Abbasov2012-12-241-2/+2
| | | |
* | | | Revert the change at ActiveModel::Errors#add_on_blank and fix in theRafael Mendonça França2012-12-263-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_blankColin Kelley2012-12-262-1/+41
| | | | | | | | | | | | | | | | | | | | Conflicts: activemodel/lib/active_model/errors.rb
* | | | Note about migration timestamps.Steve Klabnik2012-12-261-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 quotesRafael Mendonça França2012-12-261-10/+10
| | | |
* | | | Merge pull request #8616 from senny/8612_respect_yaml_keywordsRafael Mendonça França2012-12-264-7/+48
|\ \ \ \ | | | | | | | | | | quote column names in generated fixture files
| * | | | quote column names in generated fixture filesYves Senn2012-12-264-7/+48
| | | | |
* | | | | Fix CHANGELOG style [ci skip]Rafael Mendonça França2012-12-262-6/+6
| | | | |
* | | | | Merge pull request #5100 from ↵Rafael Mendonça França2012-12-263-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 callbacksPascal Friederich2012-12-263-6/+29
| | | | | |
* | | | | | We need to check explictly that env['action_dispatch.show_exceptions']Rafael Mendonça França2012-12-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is false. If it is nil we can't raise the exception
* | | | | | Merge pull request #8600 from shime/patch-1Rafael Mendonça França2012-12-261-4/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | more descriptive return parameters
| * | | | | | more descriptive return parametersHrvoje Šimić2012-12-261-4/+3
| | | | | | |
* | | | | | | Revert "Ignore /bin on new apps" -- given the move to default binstubs, we ↵David Heinemeier Hansson2012-12-261-4/+3
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | want you to check those in! This reverts commit 35c554f0bf518e1068e79002a462c3deba649e9b.
* | | | | | Merge pull request #8608 from ↵Rafael Mendonça França2012-12-252-1/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | senny/8576_cant_inherit_from_deprecated_buffered_logger deprecation warning when BufferedLogger is instantiated
| * | | | | | deprecation warning when BufferedLogger is instantiatedYves Senn2012-12-252-1/+19
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #8609 from senny/buffered_logger_documentationGuillermo Iguaran2012-12-253-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | replace AS::BufferedLogger doc mentions with AS::Logger
| * | | | | replace AS::BufferedLogger doc mentions with AS::LoggerYves Senn2012-12-253-5/+5
|/ / / / /
* | | | | Merge pull request #8607 from ↵Rafael Mendonça França2012-12-252-2/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | senny/8576_cant_inherit_from_deprecated_buffered_logger ActiveSupport::BufferedLogger can be subclassed
| * | | | | ActiveSupport::BufferedLogger can be subclassedYves Senn2012-12-252-2/+20
|/ / / / /
* | | | | Merge pull request #8592 from rafaelfranca/warning_fixGuillermo Iguaran2012-12-241-1/+5
|\ \ \ \ \ | | | | | | | | | | | | Remove warning of intance variable not initialized
| * | | | | Remove warning of intance variable not initializedRafael Mendonça França2012-12-231-1/+5
| | | | | |
* | | | | | Merge pull request #8604 from zoltankiss/minor_fixesGuillermo Iguaran2012-12-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | minor grammar fix
| * | | | | | minor grammar fixZoltan Kiss2012-12-241-1/+1
|/ / / / / /
* | | / / / silences "possibly useless use of :: in void context" warningsXavier Noria2012-12-241-7/+3
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AS utility silence_warnings does not really silence this one, because it is issued at parse-time. It seemed to in some places because the constant was the only expression in the block and therefore it was its return value, that could potentially be used by silence_warnings are return value of the yield call. To bypass the warning we assign to a variable. The chosen variable is "_" because it is special-cased in parse.c not to issue an "assigned but unused variable" warning in turn.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 23:15:16 +0000